Debounce cancel upload message

This commit is contained in:
Vincent Petry 2015-10-07 16:34:06 +02:00
parent cd818e7419
commit 8a1a1c1326
1 changed files with 5 additions and 6 deletions

View File

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