Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

REFACTOR: Remove `Discourse.SiteSettings` from text helpers

This commit is contained in:
Robin Ward 2020-07-22 14:47:10 -04:00
parent 98fee7aa50
commit 0213211068
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse-common/addon/lib/helpers.js
View File

@ -52,6 +52,8 @@ export function createHelperContext(siteSettings) {
};
}
// This can be used by a helper to get the SiteSettings. Note you should not
// be using it outside of helpers (or lib code that helpers use!)
export function helperContext() {
return _helperContext;
}

10
app/assets/javascripts/discourse/app/lib/text.js
View File

@ -7,6 +7,7 @@ import loadScript from "discourse/lib/load-script";
import { formatUsername } from "discourse/lib/utilities";
import { Promise } from "rsvp";
import { htmlSafe } from "@ember/template";
import { helperContext } from "discourse-common/lib/helpers";
function getOpts(opts) {
const siteSettings = Discourse.__container__.lookup("site-settings:main"),
@ -73,15 +74,16 @@ function createPrettyText(options) {
}
function emojiOptions() {
if (!Discourse.SiteSettings.enable_emoji) {
let siteSettings = helperContext().siteSettings;
if (!siteSettings.enable_emoji) {
return;
}
return {
getURL: url => getURLWithCDN(url),
emojiSet: Discourse.SiteSettings.emoji_set,
enableEmojiShortcuts: Discourse.SiteSettings.enable_emoji_shortcuts,
inlineEmoji: Discourse.SiteSettings.enable_inline_emoji_translation
emojiSet: siteSettings.emoji_set,
enableEmojiShortcuts: siteSettings.enable_emoji_shortcuts,
inlineEmoji: siteSettings.enable_inline_emoji_translation
};
}