summaryrefslogtreecommitdiffstats
path: root/web/react/components/textbox.jsx
diff options
context:
space:
mode:
authorJoramWilander <jwawilander@gmail.com>2015-06-29 15:20:49 -0400
committerJoramWilander <jwawilander@gmail.com>2015-06-29 15:20:49 -0400
commit2d3ef0b0510e4c0be49cb6025e312fcb932789fd (patch)
tree0d639af3121043c69f6178bde3a50cf93c942140 /web/react/components/textbox.jsx
parent7b7e73fb9290a8084989a4219681c636670e7555 (diff)
downloadchat-2d3ef0b0510e4c0be49cb6025e312fcb932789fd.tar.gz
chat-2d3ef0b0510e4c0be49cb6025e312fcb932789fd.tar.bz2
chat-2d3ef0b0510e4c0be49cb6025e312fcb932789fd.zip
@all and @channel now auto-complete
Diffstat (limited to 'web/react/components/textbox.jsx')
-rw-r--r--web/react/components/textbox.jsx2
1 files changed, 1 insertions, 1 deletions
diff --git a/web/react/components/textbox.jsx b/web/react/components/textbox.jsx
index 7a4762e07..934e863a2 100644
--- a/web/react/components/textbox.jsx
+++ b/web/react/components/textbox.jsx
@@ -153,7 +153,7 @@ module.exports = React.createClass({
var mentions = [];
for (var i = 0; i < matches.length; i++) {
var m = matches[i].substring(1,matches[i].length).trim();
- if (m in profileMap && mentions.indexOf(m) === -1) {
+ if ((m in profileMap && mentions.indexOf(m) === -1) || Constants.SPECIAL_MENTIONS.indexOf(m) !== -1) {
mentions.push(m);
}
}