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
commit12f0559e28d4e2a9217fc4333769e1344ec2711e (patch)
treea8fee4ffab2319492322e25ed01a4c9d728ebe84 /web
parent919e98d00e21bb46aeaaea7be0b7ecb60e665e91 (diff)
parent876c6069972b7d6b95d0f91f3b9c0bee7f5aedaa (diff)
downloadchat-12f0559e28d4e2a9217fc4333769e1344ec2711e.tar.gz
chat-12f0559e28d4e2a9217fc4333769e1344ec2711e.tar.bz2
chat-12f0559e28d4e2a9217fc4333769e1344ec2711e.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;
}