diff options
author | tmm576 <tmm576@users.noreply.github.com> | 2019-02-02 14:22:05 -0500 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2019-02-02 20:22:05 +0100 |
commit | 750c67660de753065ec160b4e389ba0dda2f81cc (patch) | |
tree | a5f91c6c4d5b1da1cc2f0e4e47644962b46d5be0 /app/javascript/mastodon/actions/alerts.js | |
parent | 582f86ab32b4ce2b9d242cf6f5c3c6c0dce4e144 (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/actions/alerts.js')
-rw-r--r-- | app/javascript/mastodon/actions/alerts.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/javascript/mastodon/actions/alerts.js b/app/javascript/mastodon/actions/alerts.js index 3f5d7ef46..50cd48a9e 100644 --- a/app/javascript/mastodon/actions/alerts.js +++ b/app/javascript/mastodon/actions/alerts.js @@ -22,7 +22,7 @@ export function clearAlert() { }; }; -export function showAlert(title, message) { +export function showAlert(title = messages.unexpectedTitle, message = messages.unexpectedMessage) { return { type: ALERT_SHOW, title, @@ -44,6 +44,6 @@ export function showAlertForError(error) { return showAlert(title, message); } else { console.error(error); - return showAlert(messages.unexpectedTitle, messages.unexpectedMessage); + return showAlert(); } } |