mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5762 from owncloud/files-uploaderrordelay 

Increased upload error delay to 10 seconds
This commit is contained in:
Jan-Christoph Borchardt 2013-11-08 05:36:13 -08:00
parent 4459d964d6 c16fbbf386
commit edcf1912b9
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -303,16 +303,15 @@ $(document).ready(function() {
OC.Upload.log('fail', e, data); OC.Upload.log('fail', e, data);
if (typeof data.textStatus !== 'undefined' && data.textStatus !== 'success' ) { if (typeof data.textStatus !== 'undefined' && data.textStatus !== 'success' ) {
if (data.textStatus === 'abort') { if (data.textStatus === 'abort') {
$('#notification').text(t('files', 'Upload cancelled.')); OC.Notification.show(t('files', 'Upload cancelled.'));
} else { } else {
// HTTP connection problem // HTTP connection problem
$('#notification').text(data.errorThrown); OC.Notification.show(data.errorThrown);
} }
$('#notification').fadeIn(); //hide notification after 10 sec
//hide notification after 5 sec
setTimeout(function() { setTimeout(function() {
$('#notification').fadeOut(); OC.Notification.hide();
}, 5000); }, 10000);
} }
OC.Upload.deleteUpload(data); OC.Upload.deleteUpload(data);
}, },