summaryrefslogtreecommitdiffstats
path: root/apps/files
diff options
context:
space:
mode:
Diffstat (limited to 'apps/files')
-rw-r--r--apps/files/js/file-upload.js11
1 files changed, 5 insertions, 6 deletions
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
index 8bae8567a05..77b85ecd7da 100644
--- a/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@ -75,6 +75,9 @@ OC.Upload = {
this._uploads.push(jqXHR);
}
},
+ showUploadCancelMessage: _.debounce(function() {
+ OC.Notification.showTemporary(t('files', 'Upload cancelled.'), {timeout: 10});
+ }, 500),
/**
* Checks the currently known uploads.
* returns true if any hxr has the state 'pending'
@@ -415,10 +418,10 @@ OC.Upload = {
OC.Upload.log('fail', e, data);
if (typeof data.textStatus !== 'undefined' && data.textStatus !== 'success' ) {
if (data.textStatus === 'abort') {
- OC.Notification.show(t('files', 'Upload cancelled.'));
+ OC.Upload.showUploadCancelMessage();
} else {
// HTTP connection problem
- OC.Notification.show(data.errorThrown);
+ OC.Notification.showTemporary(data.errorThrown, {timeout: 10});
if (data.result) {
var result = JSON.parse(data.result);
if (result && result[0] && result[0].data && result[0].data.code === 'targetnotfound') {
@@ -427,10 +430,6 @@ OC.Upload = {
}
}
}
- //hide notification after 10 sec
- setTimeout(function() {
- OC.Notification.hide();
- }, 10000);
}
OC.Upload.deleteUpload(data);
},