From c111777f85fc93ab18c6e28473e70c9ed2810683 Mon Sep 17 00:00:00 2001 From: Florian Orben Date: Tue, 1 Dec 2015 00:37:00 +0100 Subject: Allow to switch between default and emoji-one emoji style --- web/react/utils/utils.jsx | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'web/react/utils/utils.jsx') diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx index aa9146183..df323eb0f 100644 --- a/web/react/utils/utils.jsx +++ b/web/react/utils/utils.jsx @@ -1227,3 +1227,12 @@ export function getPostTerm(post) { export function isFeatureEnabled(feature) { return PreferenceStore.getPreference(Constants.Preferences.CATEGORY_ADVANCED_SETTINGS, Constants.FeatureTogglePrefix + feature.label, {value: 'false'}).value === 'true'; } + +export function getImagePathForEmoticon(name, style) { + const emojiStyle = style || PreferenceStore.getPreference(Constants.Preferences.CATEGORY_DISPLAY_SETTINGS, 'emoji_style', {value: 'default'}).value; + + if (name) { + return `/static/images/emoji/${emojiStyle}/${name}.png`; + } + return `/static/images/emoji/${emojiStyle}`; +} \ No newline at end of file -- cgit v1.2.3-1-g7c22 From 8a39d160f6e0c0626181279163c95ac88f01e0c5 Mon Sep 17 00:00:00 2001 From: Florian Orben Date: Tue, 1 Dec 2015 22:40:24 +0100 Subject: switch to only use emoji one smileys; remove setting to switch --- web/react/utils/utils.jsx | 9 --------- 1 file changed, 9 deletions(-) (limited to 'web/react/utils/utils.jsx') diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx index df323eb0f..f38d3e051 100644 --- a/web/react/utils/utils.jsx +++ b/web/react/utils/utils.jsx @@ -1226,13 +1226,4 @@ export function getPostTerm(post) { export function isFeatureEnabled(feature) { return PreferenceStore.getPreference(Constants.Preferences.CATEGORY_ADVANCED_SETTINGS, Constants.FeatureTogglePrefix + feature.label, {value: 'false'}).value === 'true'; -} - -export function getImagePathForEmoticon(name, style) { - const emojiStyle = style || PreferenceStore.getPreference(Constants.Preferences.CATEGORY_DISPLAY_SETTINGS, 'emoji_style', {value: 'default'}).value; - - if (name) { - return `/static/images/emoji/${emojiStyle}/${name}.png`; - } - return `/static/images/emoji/${emojiStyle}`; } \ No newline at end of file -- cgit v1.2.3-1-g7c22