wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #19708 from owncloud/revert-19628-files-canceluploaddebounce

Browse source 
Revert "Debounce cancel upload message"
This commit is contained in:
Thomas Müller 2015-10-12 14:56:23 +02:00
commit eb445103e9
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
apps/files/js/file-upload.js
View file

@ -75,9 +75,6 @@ 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'
@ -418,10 +415,10 @@ OC.Upload = {
OC.Upload.log('fail', e, data);
if (typeof data.textStatus !== 'undefined' && data.textStatus !== 'success' ) {
if (data.textStatus === 'abort') {
OC.Upload.showUploadCancelMessage();
OC.Notification.show(t('files', 'Upload cancelled.'));
} else {
// HTTP connection problem
OC.Notification.showTemporary(data.errorThrown, {timeout: 10});
OC.Notification.show(data.errorThrown);
if (data.result) {
var result = JSON.parse(data.result);
if (result && result[0] && result[0].data && result[0].data.code === 'targetnotfound') {
@ -430,6 +427,10 @@ OC.Upload = {
}
}
}
//hide notification after 10 sec
setTimeout(function() {
OC.Notification.hide();
}, 10000);
}
OC.Upload.deleteUpload(data);
},