about summary refs log tree commit diff
path: root/app/javascript/mastodon/features/compose/components/upload_button.js
diff options
context:
space:
mode:
authortmm576 <tmm576@users.noreply.github.com>2019-02-02 14:22:05 -0500
committerEugen Rochko <eugen@zeonfederated.com>2019-02-02 20:22:05 +0100
commit750c67660de753065ec160b4e389ba0dda2f81cc (patch)
treea5f91c6c4d5b1da1cc2f0e4e47644962b46d5be0 /app/javascript/mastodon/features/compose/components/upload_button.js
parent582f86ab32b4ce2b9d242cf6f5c3c6c0dce4e144 (diff)
Allow multiple files upload through web UI, including drag & drop (#9856)
* Allow drag and drop uploads of multiple files to compose

* Calculate aggregate upload progress for single action

* Allow multiple uploads to compose through traditional input, consolidate update file limit logic, provide file limit feedback
Diffstat (limited to 'app/javascript/mastodon/features/compose/components/upload_button.js')
-rw-r--r--app/javascript/mastodon/features/compose/components/upload_button.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/mastodon/features/compose/components/upload_button.js b/app/javascript/mastodon/features/compose/components/upload_button.js
index b6fe770ea..db55ad70b 100644
--- a/app/javascript/mastodon/features/compose/components/upload_button.js
+++ b/app/javascript/mastodon/features/compose/components/upload_button.js
@@ -63,7 +63,7 @@ class UploadButton extends ImmutablePureComponent {
             key={resetFileKey}
             ref={this.setRef}
             type='file'
-            multiple={false}
+            multiple
             accept={acceptContentTypes.toArray().join(',')}
             onChange={this.handleChange}
             disabled={disabled}