diff options
Diffstat (limited to 'apps/files/js/filelist.js')
| -rw-r--r-- | apps/files/js/filelist.js | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index d4a223058b4..d932c06d853 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -2786,8 +2786,13 @@ if (OC.isSamePath(OC.dirname(upload.getFullPath() + '/'), self.getCurrentDirectory())) { self._uploads[fileName] = fetchInfoPromise; } + + var uploadText = self.$fileList.find('tr .uploadtext'); + self.showFileBusyState(uploadText.closest('tr'), false); + uploadText.fadeOut(); + uploadText.attr('currentUploads', 0); }); - uploader.on('createdfolder', function(e, fullPath) { + uploader.on('createdfolder', function(fullPath) { self.addAndFetchFileInfo(OC.basename(fullPath), OC.dirname(fullPath)); }); uploader.on('stop', function() { @@ -2805,6 +2810,11 @@ self.highlightFiles(fileNames); }); self.updateStorageStatistics(); + + var uploadText = self.$fileList.find('tr .uploadtext'); + self.showFileBusyState(uploadText.closest('tr'), false); + uploadText.fadeOut(); + uploadText.attr('currentUploads', 0); }); uploader.on('fail', function(e, data) { self._uploader.log('filelist handle fileuploadfail', e, data); @@ -2812,13 +2822,11 @@ self._uploads = []; //if user pressed cancel hide upload chrome - if (data.errorThrown === 'abort') { - //cleanup uploading to a dir - var uploadText = self.$fileList.find('tr .uploadtext'); - self.showFileBusyState(uploadText.closest('tr'), false); - uploadText.fadeOut(); - uploadText.attr('currentUploads', 0); - } + //cleanup uploading to a dir + var uploadText = self.$fileList.find('tr .uploadtext'); + self.showFileBusyState(uploadText.closest('tr'), false); + uploadText.fadeOut(); + uploadText.attr('currentUploads', 0); self.updateStorageStatistics(); }); |