github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-18 07:02:28 +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/lib/helpers.js
View File

@ -1,6 +1,7 @@
import { get } from "@ember/object";
import Helper from "@ember/component/helper";
import RawHandlebars from "discourse-common/lib/raw-handlebars";
import { htmlSafe } from "@ember/template";
export function makeArray(obj) {
if (obj === null || obj === undefined) {
@ -13,7 +14,7 @@ export function htmlHelper(fn) {
return Helper.helper(function(...args) {
args =
args.length > 1 ? args[0].concat({ hash: args[args.length - 1] }) : args;
return new Handlebars.SafeString(fn.apply(this, args) || "");
return htmlSafe(fn.apply(this, args) || "");
});
}