diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-07-05 09:02:23 -0800 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-07-05 09:02:23 -0800 |
| commit | 592d68cf4134b668e3ff962d17f8aa75b1bc055f (patch) | |
| tree | 6e743b07487caf5fe350439aefdf0355a7e80d9b /web/react/components/textbox.jsx | |
| parent | 72bfc1ee2afd2fa4a34186b62f144f8f6c50d693 (diff) | |
| parent | 4a3003c0dcf7d642f233493e32b07beed5d08327 (diff) | |
| download | chat-592d68cf4134b668e3ff962d17f8aa75b1bc055f.tar.gz chat-592d68cf4134b668e3ff962d17f8aa75b1bc055f.tar.bz2 chat-592d68cf4134b668e3ff962d17f8aa75b1bc055f.zip | |
Merge branch 'master' into mm-1391
Diffstat (limited to 'web/react/components/textbox.jsx')
| -rw-r--r-- | web/react/components/textbox.jsx | 2 |
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); } } |