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

Merge pull request #1907 from nextcloud/downstream-26164 

Highlight files and update storage stats at end of upload (#26164)
This commit is contained in:
Morris Jobke 2016-10-26 13:17:35 +02:00 committed by GitHub
parent 995335b54d 50b8221255
commit ffb0e91b60
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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);

2
apps/files/js/filelist.js
View File

@ -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);

17
apps/files/tests/js/filelistSpec.js
View File

@ -2794,13 +2794,22 @@ describe('OCA.Files.FileList tests', function() {
highlightStub.restore();
});
it('queries storage stats', function() {
it('queries storage stats after all fetches are done', function() {
var statStub = sinon.stub(fileList, 'updateStorageStatistics');
addFile(createUpload('upload.txt', '/subdir'));
expect(statStub.notCalled).toEqual(true);
var highlightStub = sinon.stub(fileList, 'highlightFiles');
var def1 = addFile(createUpload('upload.txt', '/subdir'));
var def2 = addFile(createUpload('upload2.txt', '/subdir'));
var def3 = addFile(createUpload('upload3.txt', '/another'));
uploader.trigger('stop', {});
expect(statStub.notCalled).toEqual(true);
def1.resolve();
expect(statStub.notCalled).toEqual(true);
def2.resolve();
def3.resolve();
expect(statStub.calledOnce).toEqual(true);
statStub.restore();
highlightStub.restore();
});
});
});