Merge pull request #35134 from owncloud/fix-upload-cancel-issue-relea…

…se-10.2.0 [10.2.0] Backport of Aborted uploads are not cleared properly
owncloud · May 2, 2019 · c515df5 · c515df5
2 parents 5c9e26c + 5111ea7
commit c515df5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
@@ -682,6 +682,7 @@ OC.Uploader.prototype = _.extend({
 		this.log('canceling uploads');
 		jQuery.each(this._uploads, function(i, upload) {
 			upload.abort();
+			upload.aborted = true;
 		});
 		this.clear();
 	},
@@ -691,7 +692,7 @@ OC.Uploader.prototype = _.extend({
 	clear: function() {
 		var remainingUploads = {};
 		_.each(this._uploads, function(upload, key) {
-			if (!upload.isDone) {
+			if (!upload.isDone && !upload.aborted) {
 				remainingUploads[key] = upload;
 			}
 		});

diff --git a/apps/files/tests/js/fileUploadSpec.js b/apps/files/tests/js/fileUploadSpec.js
@@ -133,11 +133,13 @@ describe('OC.Upload tests', function() {
 		it('clear leaves pending uploads', function() {
 			uploader._uploads = {
 				'abc': {name: 'a job well done.txt', isDone: true},
-				'def': {name: 'whatevs.txt'}
+				'def': {name: 'whatevs.txt'},
+				'ghi': {name: 'aborted.txt', aborted: true}
 			};
 
 			uploader.clear();
 
+			//This does verify that aborted upload(s) will not be available in the _uploads
 			expect(uploader._uploads).toEqual({'def': {name: 'whatevs.txt'}});
 		});
 	});