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
commitf99ad06c19379a9279af0c260d9daceefc7fe944 (patch)
tree149d035c6a1be5cd96026c5ed4727084954334fc /web
parentcafbada5148546750ec50af8a5e754d22ebf5059 (diff)
parent8265b32b8bd0ccd7929c018eb162f5f059dd13d7 (diff)
downloadchat-f99ad06c19379a9279af0c260d9daceefc7fe944.tar.gz
chat-f99ad06c19379a9279af0c260d9daceefc7fe944.tar.bz2
chat-f99ad06c19379a9279af0c260d9daceefc7fe944.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;
}