diff options
author | Christopher Speller <crspeller@gmail.com> | 2015-10-27 08:40:49 -0400 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2015-10-27 08:40:49 -0400 |
commit | 5f424519445d934b484f5181a537a1b53033c930 (patch) | |
tree | 273c7ea8911b0e3cf346b30f18c53d3b83ade837 /web/react/utils/text_formatting.jsx | |
parent | 28847c6b4b864d747bbfdf5c53354dcb24e5f895 (diff) | |
parent | 9de0ceb22995d9bdf9b53d620471f1dd9d8042ae (diff) | |
download | chat-5f424519445d934b484f5181a537a1b53033c930.tar.gz chat-5f424519445d934b484f5181a537a1b53033c930.tar.bz2 chat-5f424519445d934b484f5181a537a1b53033c930.zip |
Merge pull request #1154 from girishso/username_symbols
auto-link mentions with user names having symbols
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; } |