about summary refs log tree commit diff
path: root/app/assets/javascripts/components/features/compose
diff options
context:
space:
mode:
authorEugen <eugen@zeonfederated.com>2017-01-05 03:34:01 +0100
committerGitHub <noreply@github.com>2017-01-05 03:34:01 +0100
commit52850c51dbfeaafe50ae92de774cc4207612c010 (patch)
treeb6674be2f5cf2ebed876db0324abc567fc676426 /app/assets/javascripts/components/features/compose
parent6c28886317bdf837e7e3f399115af91ac282735e (diff)
parent1da73ecadedf26c5f04dc2de3bb65349ffc52ab9 (diff)
Merge pull request #396 from ticky/fix-cmd-enter
Fix Command-enter tooting
Diffstat (limited to 'app/assets/javascripts/components/features/compose')
-rw-r--r--app/assets/javascripts/components/features/compose/components/compose_form.jsx4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/components/features/compose/components/compose_form.jsx b/app/assets/javascripts/components/features/compose/components/compose_form.jsx
index 55f361b0b..412c29310 100644
--- a/app/assets/javascripts/components/features/compose/components/compose_form.jsx
+++ b/app/assets/javascripts/components/features/compose/components/compose_form.jsx
@@ -49,7 +49,7 @@ const ComposeForm = React.createClass({
     this.props.onChange(e.target.value);
   },
 
-  handleKeyUp (e) {
+  handleKeyDown (e) {
     if (e.keyCode === 13 && (e.ctrlKey || e.metaKey)) {
       this.props.onSubmit();
     }
@@ -115,7 +115,7 @@ const ComposeForm = React.createClass({
           value={this.props.text}
           onChange={this.handleChange}
           suggestions={this.props.suggestions}
-          onKeyUp={this.handleKeyUp}
+          onKeyDown={this.handleKeyDown}
           onSuggestionsFetchRequested={this.onSuggestionsFetchRequested}
           onSuggestionsClearRequested={this.onSuggestionsClearRequested}
           onSuggestionSelected={this.onSuggestionSelected}