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.
This commit is contained in:
parent
89574367bc
commit
50b8221255
|
@ -1071,6 +1071,7 @@ OC.Uploader.prototype = _.extend({
|
||||||
|
|
||||||
self.clear();
|
self.clear();
|
||||||
self._hideProgressBar();
|
self._hideProgressBar();
|
||||||
|
self.trigger('stop', e, data);
|
||||||
});
|
});
|
||||||
fileupload.on('fileuploadfail', function(e, data) {
|
fileupload.on('fileuploadfail', function(e, data) {
|
||||||
self.log('progress handle fileuploadfail', e, data);
|
self.log('progress handle fileuploadfail', e, data);
|
||||||
|
|
|
@ -2810,8 +2810,8 @@
|
||||||
$.when.apply($, promises).then(function() {
|
$.when.apply($, promises).then(function() {
|
||||||
// highlight uploaded files
|
// highlight uploaded files
|
||||||
self.highlightFiles(fileNames);
|
self.highlightFiles(fileNames);
|
||||||
|
self.updateStorageStatistics();
|
||||||
});
|
});
|
||||||
self.updateStorageStatistics();
|
|
||||||
|
|
||||||
var uploadText = self.$fileList.find('tr .uploadtext');
|
var uploadText = self.$fileList.find('tr .uploadtext');
|
||||||
self.showFileBusyState(uploadText.closest('tr'), false);
|
self.showFileBusyState(uploadText.closest('tr'), false);
|
||||||
|
|
|
@ -2794,13 +2794,22 @@ describe('OCA.Files.FileList tests', function() {
|
||||||
|
|
||||||
highlightStub.restore();
|
highlightStub.restore();
|
||||||
});
|
});
|
||||||
it('queries storage stats', function() {
|
it('queries storage stats after all fetches are done', function() {
|
||||||
var statStub = sinon.stub(fileList, 'updateStorageStatistics');
|
var statStub = sinon.stub(fileList, 'updateStorageStatistics');
|
||||||
addFile(createUpload('upload.txt', '/subdir'));
|
var highlightStub = sinon.stub(fileList, 'highlightFiles');
|
||||||
expect(statStub.notCalled).toEqual(true);
|
var def1 = addFile(createUpload('upload.txt', '/subdir'));
|
||||||
|
var def2 = addFile(createUpload('upload2.txt', '/subdir'));
|
||||||
|
var def3 = addFile(createUpload('upload3.txt', '/another'));
|
||||||
uploader.trigger('stop', {});
|
uploader.trigger('stop', {});
|
||||||
|
|
||||||
|
expect(statStub.notCalled).toEqual(true);
|
||||||
|
def1.resolve();
|
||||||
|
expect(statStub.notCalled).toEqual(true);
|
||||||
|
def2.resolve();
|
||||||
|
def3.resolve();
|
||||||
expect(statStub.calledOnce).toEqual(true);
|
expect(statStub.calledOnce).toEqual(true);
|
||||||
statStub.restore();
|
|
||||||
|
highlightStub.restore();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue