about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorAA4ch1 <aa4ch1@gmail.com>2017-05-10 21:41:39 +0900
committerEugen Rochko <eugen@zeonfederated.com>2017-05-10 14:41:39 +0200
commit2db53526c94e31c1fe2982da5ca097e24333d6c1 (patch)
tree2757c8d167491fc339985acac72e397f5f2c550b /app
parent1f28d40c7840731275ae234d3f6350846dc03809 (diff)
Fix compose_form.js for #2904 (#2960)
Diffstat (limited to 'app')
-rw-r--r--app/javascript/mastodon/features/compose/components/compose_form.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/mastodon/features/compose/components/compose_form.js b/app/javascript/mastodon/features/compose/components/compose_form.js
index 68179244a..530e50b2f 100644
--- a/app/javascript/mastodon/features/compose/components/compose_form.js
+++ b/app/javascript/mastodon/features/compose/components/compose_form.js
@@ -176,7 +176,7 @@ class ComposeForm extends ImmutablePureComponent {
 
           <div className='compose-form__publish'>
             <div className='character-counter__wrapper'><CharacterCounter max={500} text={text} /></div>
-            <div className='compose-form__publish-button-wrapper'><Button text={publishText} onClick={this.handleSubmit} disabled={disabled || text.replace(/[\uD800-\uDBFF][\uDC00-\uDFFF]/g, "_").length > 500 || (text.length !==0 && text.trim().length === 0)} block /></div>
+            <div className='compose-form__publish-button-wrapper'><Button text={publishText} onClick={this.handleSubmit} disabled={disabled || this.props.is_uploading || text.replace(/[\uD800-\uDBFF][\uDC00-\uDFFF]/g, "_").length > 500 || (text.length !==0 && text.trim().length === 0)} block /></div>
           </div>
         </div>
       </div>