Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Allow multiple files upload through web UI, including drag & drop (#9856)

Browse source 
* 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
This commit is contained in:
tmm576 2019-02-02 14:22:05 -05:00 • committed by Eugen Rochko
parent 582f86ab32
commit 750c67660d
6 changed files with 42 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/javascript/mastodon/actions/alerts.js
View file

@ -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();
}
}