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

Merge pull request #8408 from owncloud/delete-spinner 

Show spinner for all files when deleting all
This commit is contained in:
Morris Jobke 2014-04-30 14:51:02 +02:00
parent 09fb533167 10bc67bef9
commit dca2d9311a
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1087,6 +1087,8 @@ window.FileList = {
else {
// no files passed, delete all in current dir
params.allfiles = true;
// show spinner for all files
this.$fileList.find('tr>td.date .action.delete').removeClass('delete-icon').addClass('progress-icon');
}
$.post(OC.filePath('files', 'ajax', 'delete.php'),
@ -1106,6 +1108,7 @@ window.FileList = {
FileList.fileSummary.remove({type: fileEl.attr('data-type'), size: fileEl.attr('data-size')});
});
}
// TODO: this info should be returned by the ajax call!
checkTrashStatus();
FileList.updateEmptyContent();
FileList.fileSummary.update();

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

@ -413,6 +413,20 @@ describe('FileList tests', function() {
expect(notificationStub.notCalled).toEqual(true);
});
it('shows spinner on files to be deleted', function() {
FileList.setFiles(testFiles);
doDelete();
expect(FileList.findFileEl('One.txt').find('.progress-icon:not(.delete-icon)').length).toEqual(1);
expect(FileList.findFileEl('Three.pdf').find('.delete-icon:not(.progress-icon)').length).toEqual(1);
});
it('shows spinner on all files when deleting all', function() {
FileList.setFiles(testFiles);
FileList.do_delete();
expect(FileList.$fileList.find('tr .progress-icon:not(.delete-icon)').length).toEqual(4);
});
it('updates summary when deleting last file', function() {
FileList.setFiles([testFiles[0], testFiles[1]]);
doDelete();