diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-12-03 08:18:33 -0500 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-12-03 08:18:33 -0500 |
| commit | eddd4e0fc49582cf7f484168f5e2c08b0ac89596 (patch) | |
| tree | db02a3aab3bd0ead440f4b49a4224679ae9bd1ed /web/react/utils | |
| parent | b3115b9cb69e9c9aefcd6c82e71c55a9288965d8 (diff) | |
| parent | 8a39d160f6e0c0626181279163c95ac88f01e0c5 (diff) | |
| download | chat-eddd4e0fc49582cf7f484168f5e2c08b0ac89596.tar.gz chat-eddd4e0fc49582cf7f484168f5e2c08b0ac89596.tar.bz2 chat-eddd4e0fc49582cf7f484168f5e2c08b0ac89596.zip | |
Merge pull request #1554 from florianorben/emoji_style
Allow to switch between default and emoji-one emoji style
Diffstat (limited to 'web/react/utils')
| -rw-r--r-- | web/react/utils/emoticons.jsx | 9 | ||||
| -rw-r--r-- | web/react/utils/utils.jsx | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/web/react/utils/emoticons.jsx b/web/react/utils/emoticons.jsx index bb948b6dc..8943e9544 100644 --- a/web/react/utils/emoticons.jsx +++ b/web/react/utils/emoticons.jsx @@ -154,6 +154,9 @@ export function handleEmoticons(text, tokens) { return output; } -function getImagePathForEmoticon(name) { - return `/static/images/emoji/${name}.png`; -} +export function getImagePathForEmoticon(name) { + if (name) { + return `/static/images/emoji/${name}.png`; + } + return `/static/images/emoji`; +}
\ No newline at end of file diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx index 7cc8a5c97..ab09ea919 100644 --- a/web/react/utils/utils.jsx +++ b/web/react/utils/utils.jsx @@ -1238,4 +1238,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'; -} +}
\ No newline at end of file |