github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-30 15:28:37 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: Support for import Handlebars from 'handlebars'; (#9600)

Browse Source 
* Remove Handlebars.SafeString usage

* DEV: Support for `import Handlebars from 'handlebars'`;

* FIX: Sprockets was broken when `node_modules` was present

By default the old version of sprockets looks for application.js
anywhere, including in a node_modules folder if this exists
(which it will when we move to Ember CLI.)
This commit is contained in:
Robin Ward
2020-04-30 16:41:02 -04:00
committed by GitHub
parent 2cb9e85d14
commit d615de9139
27 changed files with 57 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/discourse-common/addon/helpers/fa-icon.js
View File

@ -1,6 +1,7 @@
import { registerUnbound } from "discourse-common/lib/helpers";
import { renderIcon } from "discourse-common/lib/icon-library";
import deprecated from "discourse-common/lib/deprecated";
import { htmlSafe } from "@ember/template";
export function iconHTML(id, params) {
return renderIcon("string", id, params);
@ -8,5 +9,5 @@ export function iconHTML(id, params) {
registerUnbound("fa-icon", function(icon, params) {
deprecated("Use `{{d-icon}}` instead of `{{fa-icon}}");
return new Handlebars.SafeString(iconHTML(icon, params));
return htmlSafe(iconHTML(icon, params));
});