Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Fix ctrl+enter not submitting toot when text cursor is composing image description (#8273)

Browse source
This commit is contained in:
Spanky 2018-08-18 12:40:35 -05:00 • committed by Eugen Rochko
parent 298ee84488
commit 7a0f781aa9
2 changed files with 18 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

13
app/javascript/mastodon/features/compose/components/upload.js
View file

@ -20,6 +20,7 @@ export default class Upload extends ImmutablePureComponent {
onUndo: PropTypes.func.isRequired,
onDescriptionChange: PropTypes.func.isRequired,
onOpenFocalPoint: PropTypes.func.isRequired,
onSubmit: PropTypes.func.isRequired,
};
state = {
@ -28,6 +29,17 @@ export default class Upload extends ImmutablePureComponent {
dirtyDescription: null,
};
handleKeyDown = (e) => {
if (e.keyCode === 13 && (e.ctrlKey || e.metaKey)) {
this.handleSubmit();
}
}
handleSubmit = () => {
this.handleInputBlur();
this.props.onSubmit();
}
handleUndoClick = () => {
this.props.onUndo(this.props.media.get('id'));
}
@ -93,6 +105,7 @@ export default class Upload extends ImmutablePureComponent {
onFocus={this.handleInputFocus}
onChange={this.handleInputChange}
onBlur={this.handleInputBlur}
onKeyDown={this.handleKeyDown}
/>
</label>
</div>