luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-17 19:05:01 +00:00
Code Issues Projects Releases Wiki Activity

Fix: Prevent submission using same logic as submit button disabling. (#6993)

Browse source 
This prevents submission through ctrl/cmd+enter when the submit button is disabled.
This commit is contained in:
Emelia Smith 2018-04-01 22:19:43 +02:00 committed by Eugen Rochko
parent 993ce0e5a7
commit 6a895e1ab3
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/javascript/mastodon/features/compose/components/compose_form.js
View file

@ -74,6 +74,14 @@ export default class ComposeForm extends ImmutablePureComponent {
this.props.onChange(this.autosuggestTextarea.textarea.value);
}
// Submit disabled:
const { is_submitting, is_uploading, anyMedia } = this.props;
const fulltext = [this.props.spoiler_text, countableText(this.props.text)].join('');
if (is_submitting || is_uploading || length(fulltext) > 500 || (fulltext.length !== 0 && fulltext.trim().length === 0 && !anyMedia)) {
return;
}
this.props.onSubmit();
}