specter/mastodon
1
0
Fork 0
forked from fedi/mastodon
Code Pull requests Activity

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

Browse source 
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, onSuggestionsClearRequested: React.PropTypes.func.isRequired,
onSuggestionsFetchRequested: React.PropTypes.func.isRequired, onSuggestionsFetchRequested: React.PropTypes.func.isRequired,
onChange: React.PropTypes.func.isRequired, onChange: React.PropTypes.func.isRequired,
onKeyUp: React.PropTypes.func onKeyUp: React.PropTypes.func,
onKeyDown: React.PropTypes.func
}, },
getInitialState () { getInitialState () {
@ -108,6 +109,12 @@ const AutosuggestTextarea = React.createClass({
break; break;
} }
if (e.defaultPrevented || !this.props.onKeyDown) {
return;
}
this.props.onKeyDown(e);
}, },
onBlur () { 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); this.props.onChange(e.target.value);
}, },
handleKeyUp (e) { handleKeyDown (e) {
if (e.keyCode === 13 && (e.ctrlKey || e.metaKey)) { if (e.keyCode === 13 && (e.ctrlKey || e.metaKey)) {
this.props.onSubmit(); this.props.onSubmit();
} }
@ -115,7 +115,7 @@ const ComposeForm = React.createClass({
value={this.props.text} value={this.props.text}
onChange={this.handleChange} onChange={this.handleChange}
suggestions={this.props.suggestions} suggestions={this.props.suggestions}
onKeyUp={this.handleKeyUp} onKeyDown={this.handleKeyDown}
onSuggestionsFetchRequested={this.onSuggestionsFetchRequested} onSuggestionsFetchRequested={this.onSuggestionsFetchRequested}
onSuggestionsClearRequested={this.onSuggestionsClearRequested} onSuggestionsClearRequested={this.onSuggestionsClearRequested}
onSuggestionSelected={this.onSuggestionSelected} onSuggestionSelected={this.onSuggestionSelected}