diff options
author | =Corey Hulen <corey@hulen.com> | 2015-10-27 11:52:13 -0700 |
---|---|---|
committer | =Corey Hulen <corey@hulen.com> | 2015-10-27 11:52:13 -0700 |
commit | a133f82421d2c67ef32b0aae69a6646a14f97dfc (patch) | |
tree | 35fe7dcf6b208437111c5d3a843eabf2f4703101 /web/react/utils/text_formatting.jsx | |
parent | e22b9f53034280cd3b730c03520469dca4046484 (diff) | |
parent | e0f69060fa462390779dd7b4cf6b67a12c3974ba (diff) | |
download | chat-a133f82421d2c67ef32b0aae69a6646a14f97dfc.tar.gz chat-a133f82421d2c67ef32b0aae69a6646a14f97dfc.tar.bz2 chat-a133f82421d2c67ef32b0aae69a6646a14f97dfc.zip |
Merge branch 'master' into PLT-340
Diffstat (limited to 'web/react/utils/text_formatting.jsx')
-rw-r--r-- | web/react/utils/text_formatting.jsx | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/web/react/utils/text_formatting.jsx b/web/react/utils/text_formatting.jsx index 4b6d87254..9f1a5a53f 100644 --- a/web/react/utils/text_formatting.jsx +++ b/web/react/utils/text_formatting.jsx @@ -47,8 +47,8 @@ export function doFormatText(text, options) { const tokens = new Map(); // replace important words and phrases with tokens - output = autolinkUrls(output, tokens); output = autolinkAtMentions(output, tokens); + output = autolinkUrls(output, tokens); output = autolinkHashtags(output, tokens); if (!('emoticons' in options) || options.emoticon) { @@ -78,6 +78,13 @@ export function doFormatEmoticons(text) { return output; } +export function doFormatMentions(text) { + const tokens = new Map(); + let output = autolinkAtMentions(text, tokens); + output = replaceTokens(output, tokens); + return output; +} + export function sanitizeHtml(text) { let output = text; @@ -188,6 +195,7 @@ function autolinkAtMentions(text, tokens) { let output = text; output = output.replace(/(^|\s)(@([a-z0-9.\-_]*))/gi, replaceAtMentionWithToken); + return output; } |