summaryrefslogtreecommitdiffstats
path: root/web/react/components
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
commitf34074a45595a9b4d0a66acd656fe0146a8781cf (patch)
treede63276a966ebf3e0bf722995519f65dc8ce7581 /web/react/components
parent8e65f38979696df993c15a5c3752f4bba91a0978 (diff)
parent6016a98ea3371755c93de054ca7fa0e553f94f78 (diff)
downloadchat-f34074a45595a9b4d0a66acd656fe0146a8781cf.tar.gz
chat-f34074a45595a9b4d0a66acd656fe0146a8781cf.tar.bz2
chat-f34074a45595a9b4d0a66acd656fe0146a8781cf.zip
Merge pull request #5 from mattermost/master
to me
Diffstat (limited to 'web/react/components')
-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;
}