diff options
Diffstat (limited to 'webapp/utils/text_formatting.jsx')
-rw-r--r-- | webapp/utils/text_formatting.jsx | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/webapp/utils/text_formatting.jsx b/webapp/utils/text_formatting.jsx index 91be443fc..0b46edaeb 100644 --- a/webapp/utils/text_formatting.jsx +++ b/webapp/utils/text_formatting.jsx @@ -4,6 +4,7 @@ import Autolinker from 'autolinker'; import {browserHistory} from 'react-router/es6'; import Constants from './constants.jsx'; +import EmojiStore from 'stores/emoji_store.jsx'; import * as Emoticons from './emoticons.jsx'; import * as Markdown from './markdown.jsx'; import PreferenceStore from 'stores/preference_store.jsx'; @@ -61,7 +62,7 @@ export function doFormatText(text, options) { output = autolinkHashtags(output, tokens); if (!('emoticons' in options) || options.emoticon) { - output = Emoticons.handleEmoticons(output, tokens); + output = Emoticons.handleEmoticons(output, tokens, options.emojis || EmojiStore.getEmojis()); } if (options.searchTerm) { @@ -75,15 +76,13 @@ export function doFormatText(text, options) { if (!('emoticons' in options) || options.emoticon) { output = twemoji.parse(output, { className: 'emoticon', - base: '', - folder: Constants.EMOJI_PATH, - callback: (icon, twemojiOptions) => { - if (!Emoticons.getEmoticonsByCodePoint().has(icon)) { + callback: (icon) => { + if (!EmojiStore.hasUnicode(icon)) { // just leave the unicode characters and hope the browser can handle it return null; } - return ''.concat(twemojiOptions.base, twemojiOptions.size, '/', icon, twemojiOptions.ext); + return EmojiStore.getEmojiImageUrl(EmojiStore.getUnicode(icon)); } }); } |