From 50b8221255c7fe88a1968419904ff295c4db9613 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Wed, 21 Sep 2016 18:49:15 +0200
Subject: Highlight files and update storage stats at end of upload (#26164)

Properly trigger the "stop" even from the uploader.
Also update storage stats at the end of all uploads instead of for each
upload.
---
 apps/files/js/file-upload.js | 1 +
 apps/files/js/filelist.js    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'apps/files/js')

diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
index 30784528700..8fec7d5c04e 100644
--- a/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@ -1071,6 +1071,7 @@ OC.Uploader.prototype = _.extend({
 
 					self.clear();
 					self._hideProgressBar();
+					self.trigger('stop', e, data);
 				});
 				fileupload.on('fileuploadfail', function(e, data) {
 					self.log('progress handle fileuploadfail', e, data);
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index bf4fd75d4cc..18534db3ee9 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -2810,8 +2810,8 @@
 				$.when.apply($, promises).then(function() {
 					// highlight uploaded files
 					self.highlightFiles(fileNames);
+					self.updateStorageStatistics();
 				});
-				self.updateStorageStatistics();
 
 				var uploadText = self.$fileList.find('tr .uploadtext');
 				self.showFileBusyState(uploadText.closest('tr'), false);
-- 
cgit v1.2.3