From df8ae6891c067382932a49006edb4bc21c828448 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 19 Aug 2020 12:25:13 -0400 Subject: [PATCH] REFACTOR: Remove constants from `text` helper --- app/assets/javascripts/discourse/app/lib/text.js | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/app/assets/javascripts/discourse/app/lib/text.js b/app/assets/javascripts/discourse/app/lib/text.js index 097e777fc0..57ed68f890 100644 --- a/app/assets/javascripts/discourse/app/lib/text.js +++ b/app/assets/javascripts/discourse/app/lib/text.js @@ -11,16 +11,15 @@ import { helperContext } from "discourse-common/lib/helpers"; import Session from "discourse/models/session"; function getOpts(opts) { - const siteSettings = Discourse.__container__.lookup("site-settings:main"), - site = Discourse.__container__.lookup("site:main"); + let context = helperContext(); - opts = _.merge( + opts = Object.assign( { getURL: getURLWithCDN, - currentUser: Discourse.__container__.lookup("current-user:main"), - censoredRegexp: site.censored_regexp, - customEmojiTranslation: site.custom_emoji_translation, - siteSettings, + currentUser: context.currentUser, + censoredRegexp: context.site.censored_regexp, + customEmojiTranslation: context.site.custom_emoji_translation, + siteSettings: context.siteSettings, formatUsername }, opts