diff options
Diffstat (limited to 'webapp/utils/text_formatting.jsx')
-rw-r--r-- | webapp/utils/text_formatting.jsx | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/webapp/utils/text_formatting.jsx b/webapp/utils/text_formatting.jsx index bd718b363..c2c71a4e1 100644 --- a/webapp/utils/text_formatting.jsx +++ b/webapp/utils/text_formatting.jsx @@ -166,13 +166,8 @@ export function autolinkAtMentions(text, tokens, usernameMap) { const index = tokens.size; const alias = `$MM_ATMENTION${index}`; - let tokenValue = `<span data-mention='${username}'><a class='mention-link' href='#'>${mention}</a></span>`; - if (Constants.SPECIAL_MENTIONS.indexOf(username) >= 0) { - tokenValue = mention; - } - tokens.set(alias, { - value: tokenValue, + value: `<a class='mention-link' href='#' data-mention='${username}'>${mention}</a>`, originalText: mention }); return alias; @@ -186,7 +181,8 @@ export function autolinkAtMentions(text, tokens, usernameMap) { const truncated = usernameLower.substring(0, c); const suffix = usernameLower.substring(c); - if (mentionExists(truncated) && (c === usernameLower.length || punctuation.test(usernameLower[c]))) { + // If we've found a username or run out of punctuation to trim off, render it as an at mention + if (mentionExists(truncated) || !punctuation.test(truncated[truncated.length - 1])) { const alias = addToken(truncated, '@' + truncated); return prefix + alias + suffix; } |