summaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorReed Garmsen <rgarmsen2295@gmail.com>2015-06-17 11:09:50 -0700
committerReed Garmsen <rgarmsen2295@gmail.com>2015-06-17 11:09:50 -0700
commit79f59bbadefe73830bf82a266571ef26b38eacc3 (patch)
tree13eb86ff4f2359ef41f4865347c6333c743f4f0b /web
parent2ec91fa5e6dff2881ff49ee619a06f4f1bf3f147 (diff)
parentfad1069649a67c0c4b3db9afafde084d68ff1aec (diff)
downloadchat-79f59bbadefe73830bf82a266571ef26b38eacc3.tar.gz
chat-79f59bbadefe73830bf82a266571ef26b38eacc3.tar.bz2
chat-79f59bbadefe73830bf82a266571ef26b38eacc3.zip
Merge pull request #5 from mattermost/master
to me
Diffstat (limited to 'web')
-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 45798809f..7a4762e07 100644
--- a/web/react/components/textbox.jsx
+++ b/web/react/components/textbox.jsx
@@ -204,7 +204,7 @@ module.exports = React.createClass({
// If there is a space after the last @, nothing to do.
if (lastSpace > atIndex || lastCharSpace > atIndex) {
- this.setState({ mentionText: '-1' });
+ this.updateMentionTab('-1', null);
return;
}