From 6a895e1ab3d69cd018423460518a1e16307999ad Mon Sep 17 00:00:00 2001
From: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
Date: Sun, 1 Apr 2018 22:19:43 +0200
Subject: [PATCH] Fix: Prevent submission using same logic as submit button
disabling. (#6993)
This prevents submission through ctrl/cmd+enter when the submit button is disabled.
---
.../mastodon/features/compose/components/compose_form.js | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/app/javascript/mastodon/features/compose/components/compose_form.js b/app/javascript/mastodon/features/compose/components/compose_form.js
index 663ccfb8e..fe7bb1cb3 100644
--- a/app/javascript/mastodon/features/compose/components/compose_form.js
+++ b/app/javascript/mastodon/features/compose/components/compose_form.js
@@ -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();
}
--
GitLab