diff --git a/app/javascript/mastodon/features/compose/components/compose_form.js b/app/javascript/mastodon/features/compose/components/compose_form.js
index ba2d20cc7..7b477f491 100644
--- a/app/javascript/mastodon/features/compose/components/compose_form.js
+++ b/app/javascript/mastodon/features/compose/components/compose_form.js
@@ -86,7 +86,7 @@ class ComposeForm extends ImmutablePureComponent {
const fulltext = this.getFulltextForCharacterCounting();
const isOnlyWhitespace = fulltext.length !== 0 && fulltext.trim().length === 0;
- return !(isSubmitting || isUploading || isChangingUpload || length(fulltext) > 500 || (isOnlyWhitespace && !anyMedia));
+ return !(isSubmitting || isUploading || isChangingUpload || length(fulltext) > 4096 || (isOnlyWhitespace && !anyMedia));
}
handleSubmit = () => {
@@ -196,6 +196,11 @@ class ComposeForm extends ImmutablePureComponent {
render () {
const { intl, onPaste, showSearch } = this.props;
const disabled = this.props.isSubmitting;
+<<<<<<< HEAD
+=======
+ const text = [this.props.spoilerText, countableText(this.props.text)].join('');
+ const disabledButton = disabled || this.props.isUploading || this.props.isChangingUpload || length(text) > 4096 || (text.length !== 0 && text.trim().length === 0 && !anyMedia);
+>>>>>>> scalybiz-3.2rc
let publishText = '';
if (this.props.privacy === 'private' || this.props.privacy === 'direct') {
@@ -257,7 +262,7 @@ class ComposeForm extends ImmutablePureComponent {
-
diff --git a/app/javascript/mastodon/features/compose/components/poll_form.js b/app/javascript/mastodon/features/compose/components/poll_form.js
index db49f90eb..c8c1d6ec7 100644
--- a/app/javascript/mastodon/features/compose/components/poll_form.js
+++ b/app/javascript/mastodon/features/compose/components/poll_form.js
@@ -102,7 +102,7 @@ class Option extends React.PureComponent {
-
+
);
@@ -157,7 +157,7 @@ class PollForm extends ImmutablePureComponent {
-
+
{/* eslint-disable-next-line jsx-a11y/no-onchange */}