summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoramWilander <jwawilander@gmail.com>2015-06-16 07:43:49 -0400
committerJoramWilander <jwawilander@gmail.com>2015-06-16 07:43:49 -0400
commit25338ee95faeacb06f2e88698ee094613d65633f (patch)
tree36272944dd63c3ca3b058ff392fbf2ff258f9f88
parentb7a821c3410ecd165241e2dbcf2c8376ae402124 (diff)
downloadchat-25338ee95faeacb06f2e88698ee094613d65633f.tar.gz
chat-25338ee95faeacb06f2e88698ee094613d65633f.tar.bz2
chat-25338ee95faeacb06f2e88698ee094613d65633f.zip
fixes mm-1263 mentions are highlighted properly now
-rw-r--r--web/react/utils/utils.jsx4
1 files changed, 2 insertions, 2 deletions
diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx
index 72ed48faf..b2dcee7cd 100644
--- a/web/react/utils/utils.jsx
+++ b/web/react/utils/utils.jsx
@@ -425,7 +425,7 @@ module.exports.textToJsx = function(text, options) {
} else if (trimWord.match(hashRegex)) {
var suffix = word.match(puncEndRegex);
var prefix = word.match(puncStartRegex);
- var mClass = trimWord in implicitKeywords ? mentionClass : "";
+ var mClass = trimWord in implicitKeywords || trimWord.toLowerCase() in implicitKeywords ? mentionClass : "";
if (searchTerm === trimWord.substring(1).toLowerCase() || searchTerm === trimWord.toLowerCase()) {
highlightSearchClass = " search-highlight";
@@ -433,7 +433,7 @@ module.exports.textToJsx = function(text, options) {
inner.push(<span key={word+i+z+"_span"}>{prefix}<a key={word+i+z+"_hash"} className={"theme " + mClass + highlightSearchClass} href="#" onClick={function(value) { return function() { module.exports.searchForTerm(value); } }(trimWord)}>{trimWord}</a>{suffix} </span>);
- } else if (trimWord in implicitKeywords) {
+ } else if (trimWord in implicitKeywords || trimWord.toLowerCase() in implicitKeywords) {
var suffix = word.match(puncEndRegex);
var prefix = word.match(puncStartRegex);