mirrors
/
glitch-social
mirror of https://github.com/glitch-soc/mastodon
1
0
Fork 0
Code Releases Activity

Merge pull request #396 from ticky/fix-cmd-enter 

Fix Command-enter tooting
This commit is contained in:
Eugen 2017-01-05 03:34:01 +01:00 committed by GitHub
parent 6c28886317 1da73ecade
commit 52850c51db
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/assets/javascripts/components/components/autosuggest_textarea.jsx
View File

@ -38,7 +38,8 @@ const AutosuggestTextarea = React.createClass({
onSuggestionsClearRequested: React.PropTypes.func.isRequired,
onSuggestionsFetchRequested: React.PropTypes.func.isRequired,
onChange: React.PropTypes.func.isRequired,
onKeyUp: React.PropTypes.func
onKeyUp: React.PropTypes.func,
onKeyDown: React.PropTypes.func
},
getInitialState () {
@ -108,6 +109,12 @@ const AutosuggestTextarea = React.createClass({
break;
}
if (e.defaultPrevented || !this.props.onKeyDown) {
return;
}
this.props.onKeyDown(e);
},
onBlur () {

4
app/assets/javascripts/components/features/compose/components/compose_form.jsx
View File

@ -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}