diff options
author | hmhealey <harrisonmhealey@gmail.com> | 2015-09-22 14:14:54 -0400 |
---|---|---|
committer | hmhealey <harrisonmhealey@gmail.com> | 2015-09-22 14:14:54 -0400 |
commit | 1709532ae6f48df0c152afb6a58597cd07d6df49 (patch) | |
tree | 9c3c4861ddea1f62172abbef8ec718673ae04a9c /web/react/utils/text_formatting.jsx | |
parent | ffe34aa1544172b42658cd628cdcc4036d6ff403 (diff) | |
download | chat-1709532ae6f48df0c152afb6a58597cd07d6df49.tar.gz chat-1709532ae6f48df0c152afb6a58597cd07d6df49.tar.bz2 chat-1709532ae6f48df0c152afb6a58597cd07d6df49.zip |
Moved emoticon parsing to happen after url parsing so that we don't have smilies accidentally occuring in urls
Diffstat (limited to 'web/react/utils/text_formatting.jsx')
-rw-r--r-- | web/react/utils/text_formatting.jsx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/web/react/utils/text_formatting.jsx b/web/react/utils/text_formatting.jsx index be82f7b9c..940bd0485 100644 --- a/web/react/utils/text_formatting.jsx +++ b/web/react/utils/text_formatting.jsx @@ -36,14 +36,14 @@ export function formatText(text, options = {}) { const tokens = new Map(); // replace important words and phrases with tokens - if (!('emoticons' in options) || options.emoticon) { - output = Emoticons.handleEmoticons(output, tokens); - } - output = autolinkUrls(output, tokens, !!options.markdown); output = autolinkAtMentions(output, tokens); output = autolinkHashtags(output, tokens); + if (!('emoticons' in options) || options.emoticon) { + output = Emoticons.handleEmoticons(output, tokens); + } + if (options.searchTerm) { output = highlightSearchTerm(output, tokens, options.searchTerm); } |