diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2015-06-30 11:58:22 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2015-06-30 11:58:22 -0400 |
| commit | a00b4e00adeacfbe59b523d46e566186631eab52 (patch) | |
| tree | 83949f6e97ecac3c09084b06c943b1fdf33f8873 /web/react/components/textbox.jsx | |
| parent | ae21685e357416dab708e304fd8d9c005b11278d (diff) | |
| parent | 8be4df00b4d30c220d6f0d13734501c8c94e6495 (diff) | |
| download | chat-a00b4e00adeacfbe59b523d46e566186631eab52.tar.gz chat-a00b4e00adeacfbe59b523d46e566186631eab52.tar.bz2 chat-a00b4e00adeacfbe59b523d46e566186631eab52.zip | |
Merge pull request #106 from mattermost/mm-1119
fixes mm-1119 adds @all and @channel mention capabilites
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); } } |