diff options
| -rw-r--r-- | app/javascript/flavours/glitch/features/compose/components/compose_form.js | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/app/javascript/flavours/glitch/features/compose/components/compose_form.js b/app/javascript/flavours/glitch/features/compose/components/compose_form.js index 3d736e83f..a7cb95222 100644 --- a/app/javascript/flavours/glitch/features/compose/components/compose_form.js +++ b/app/javascript/flavours/glitch/features/compose/components/compose_form.js @@ -158,19 +158,12 @@ class ComposeForm extends ImmutablePureComponent { this.props.onSuggestionSelected(tokenStart, token, value, ['spoiler_text']); } - // When the escape key is released, we focus the UI. - handleKeyUp = ({ key, ctrlKey, keyCode, metaKey, altKey }) => { - if (key === 'Escape') { - document.querySelector('.ui').parentElement.focus(); - } - - // We submit the status on control/meta + enter. - if (keyCode === 13 && (ctrlKey || metaKey)) { + handleKeyDown = (e) => { + if (e.keyCode === 13 && (e.ctrlKey || e.metaKey)) { this.handleSubmit(); } - // Submit the status with secondary visibility on alt + enter. - if (keyCode === 13 && altKey) { + if (e.keyCode == 13 && e.altKey) { this.handleSecondarySubmit(); } } @@ -305,7 +298,7 @@ class ComposeForm extends ImmutablePureComponent { placeholder={intl.formatMessage(messages.spoiler_placeholder)} value={spoilerText} onChange={this.handleChangeSpoiler} - onKeyUp={this.handleKeyUp} + onKeyDown={this.handleKeyDown} disabled={!spoiler} ref={this.handleRefSpoilerText} suggestions={this.props.suggestions} @@ -325,7 +318,7 @@ class ComposeForm extends ImmutablePureComponent { disabled={isSubmitting} value={this.props.text} onChange={this.handleChange} - onKeyUp={this.handleKeyUp} + onKeyDown={this.handleKeyDown} suggestions={this.props.suggestions} onFocus={this.handleFocus} onSuggestionsFetchRequested={onFetchSuggestions} |