summaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorReed Garmsen <rgarmsen2295@gmail.com>2015-06-17 11:29:13 -0700
committerReed Garmsen <rgarmsen2295@gmail.com>2015-06-17 11:29:13 -0700
commit9c2379a7110fb4589961a331e2d2598020d16119 (patch)
tree0fdb9eff471d0347ebca7ab3ec33401de30bc109 /web
parent31d795b459c396d8e2e3df0ee11c096392109464 (diff)
parent12f0559e28d4e2a9217fc4333769e1344ec2711e (diff)
downloadchat-9c2379a7110fb4589961a331e2d2598020d16119.tar.gz
chat-9c2379a7110fb4589961a331e2d2598020d16119.tar.bz2
chat-9c2379a7110fb4589961a331e2d2598020d16119.zip
Merge pull request #6 from rgarmsen2295/master
Remerging
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;
}