summaryrefslogtreecommitdiffstats
path: root/apps/files
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2016-02-19 12:09:46 +0100
committerVincent Petry <pvince81@owncloud.com>2016-02-22 17:25:32 +0100
commit8ea80e114ae508586947db614b37db6b35972a9c (patch)
tree608e6b0ff76787b4db1d5ccde39d2ca00859684a /apps/files
parent6f29949bcaef690a93d7ecfb5cde8fa08ce36db7 (diff)
downloadnextcloud-server-8ea80e114ae508586947db614b37db6b35972a9c.tar.gz
nextcloud-server-8ea80e114ae508586947db614b37db6b35972a9c.zip
Accumulate notifications instead of blinking
This makes it possible to display multiple notifications. If the options.type is set to "error", it will also add a close button.
Diffstat (limited to 'apps/files')
-rw-r--r--apps/files/js/file-upload.js6
1 files changed, 5 insertions, 1 deletions
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
index 8ba294e2a7f..bd80afd072c 100644
--- a/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@ -472,7 +472,11 @@ OC.Upload = {
OC.Upload.showUploadCancelMessage();
} else {
// HTTP connection problem
- OC.Notification.showTemporary(data.errorThrown, {timeout: 10});
+ var message = t('files', 'Error uploading file "{fileName}": {message}', {
+ fileName: data.files[0].name,
+ message: data.errorThrown
+ });
+ OC.Notification.show(message, {timeout: 0, type: 'error'});
if (data.result) {
var result = JSON.parse(data.result);
if (result && result[0] && result[0].data && result[0].data.code === 'targetnotfound') {