summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2015-09-05 19:42:14 -0400
committerJoram Wilander <jwawilander@gmail.com>2015-09-05 19:42:14 -0400
commit798d5a8c021a269b4d3faed7e6c86a856471527f (patch)
treec140a82337e9f170ec420a116d9203e87b62d08a
parent8f282d12f6bcb8dbe77254b4f8111362e68c7d1c (diff)
parent45b034053a80f20b7d4972061d24e2e482c5503f (diff)
downloadchat-798d5a8c021a269b4d3faed7e6c86a856471527f.tar.gz
chat-798d5a8c021a269b4d3faed7e6c86a856471527f.tar.bz2
chat-798d5a8c021a269b4d3faed7e6c86a856471527f.zip
Merge pull request #605 from hmhealey/uppercasementions
MM-2113 Fixed @mentions being highlighted for all users instead of just the user being mentioned
-rw-r--r--web/react/utils/utils.jsx2
1 files changed, 1 insertions, 1 deletions
diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx
index ea42256aa..71cd1d344 100644
--- a/web/react/utils/utils.jsx
+++ b/web/react/utils/utils.jsx
@@ -498,7 +498,7 @@ export function textToJsx(textin, options) {
// do both a non-case sensitive and case senstive check
let mClass = '';
- if (('@' + name.toLowerCase()) !== -1 || implicitKeywords.indexOf('@' + name) !== -1) {
+ if (implicitKeywords.indexOf('@' + name.toLowerCase()) !== -1 || implicitKeywords.indexOf('@' + name) !== -1) {
mClass = mentionClass;
}