summaryrefslogtreecommitdiffstats
path: root/web/react
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
commite7f4a7b5abdf1736bca878c97aca7ff109a672f2 (patch)
tree66222992c1a31a64b8aea0d547df78856c27c4c0 /web/react
parentd8ebad2658942242f82af118b6978f2d94cfb372 (diff)
parent79f59bbadefe73830bf82a266571ef26b38eacc3 (diff)
downloadchat-e7f4a7b5abdf1736bca878c97aca7ff109a672f2.tar.gz
chat-e7f4a7b5abdf1736bca878c97aca7ff109a672f2.tar.bz2
chat-e7f4a7b5abdf1736bca878c97aca7ff109a672f2.zip
Merge pull request #6 from rgarmsen2295/master
Remerging
Diffstat (limited to 'web/react')
-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;
}