REFACTOR: Migrate markdown functionality in ES6

This commit is contained in:
Robin Ward
2016-06-14 14:31:51 -04:00
parent bc25d9a7a0
commit a546395397
146 changed files with 3259 additions and 5675 deletions

View File

@ -1,3 +1,5 @@
import { escapeExpression } from 'discourse/lib/utilities';
export default Ember.Controller.extend({
needs: ['modal'],
@ -22,7 +24,7 @@ export default Ember.Controller.extend({
returned = "<pre class='badge-query-plan'>";
_.each(raw, function(linehash) {
returned += Discourse.Utilities.escapeExpression(linehash["QUERY PLAN"]);
returned += escapeExpression(linehash["QUERY PLAN"]);
returned += "<br>";
});
@ -32,7 +34,7 @@ export default Ember.Controller.extend({
processed_sample: Ember.computed.map('model.sample', function(grant) {
var i18nKey = 'admin.badges.preview.grant.with',
i18nParams = { username: Discourse.Utilities.escapeExpression(grant.username) };
i18nParams = { username: escapeExpression(grant.username) };
if (grant.post_id) {
i18nKey += "_post";
@ -41,7 +43,7 @@ export default Ember.Controller.extend({
if (grant.granted_at) {
i18nKey += "_time";
i18nParams.time = Discourse.Utilities.escapeExpression(moment(grant.granted_at).format(I18n.t('dates.long_with_year')));
i18nParams.time = escapeExpression(moment(grant.granted_at).format(I18n.t('dates.long_with_year')));
}
return I18n.t(i18nKey, i18nParams);