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
commit50c97f415524c400e5c9877ff4107ed9e22d96cd (patch)
tree663777ab07dd43367c6e591ed5163bfbd9302a49 /web
parente142a8cb24a1edae8df569dd9971d561330d30bc (diff)
parentf34074a45595a9b4d0a66acd656fe0146a8781cf (diff)
downloadchat-50c97f415524c400e5c9877ff4107ed9e22d96cd.tar.gz
chat-50c97f415524c400e5c9877ff4107ed9e22d96cd.tar.bz2
chat-50c97f415524c400e5c9877ff4107ed9e22d96cd.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;
}