summaryrefslogtreecommitdiffstats
path: root/web/react/components
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
commitbf3ca45dac4b56d06394dd3ceb1cece61a10f1ae (patch)
tree0cf8da7c58b06c0482a7fc2e769f1e7555f53993 /web/react/components
parent2a427254f4263b1d0b5f7c44268a0d34948971a7 (diff)
parentf99ad06c19379a9279af0c260d9daceefc7fe944 (diff)
downloadchat-bf3ca45dac4b56d06394dd3ceb1cece61a10f1ae.tar.gz
chat-bf3ca45dac4b56d06394dd3ceb1cece61a10f1ae.tar.bz2
chat-bf3ca45dac4b56d06394dd3ceb1cece61a10f1ae.zip
Merge pull request #6 from rgarmsen2295/master
Remerging
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;
}