diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 4567052b2a982871423dfa17663a3f4bdb69109b..86cba29e76c96d1a5bf02e6d9a36f7f1cae9fcb9 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -1427,7 +1427,7 @@ if (files) { for (var i=0; i<files.length; i++) { var deleteAction = this.findFileEl(files[i]).children("td.date").children(".action.delete"); - deleteAction.removeClass('icon-delete').addClass('progress-icon'); + deleteAction.removeClass('icon-delete').addClass('icon-loading-small'); } } // Finish any existing actions @@ -1445,7 +1445,7 @@ // 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('icon-delete').addClass('progress-icon'); + this.$fileList.find('tr>td.date .action.delete').removeClass('icon-delete').addClass('icon-loading-small'); } $.post(OC.filePath('files', 'ajax', 'delete.php'), @@ -1489,7 +1489,7 @@ else { $.each(files,function(index,file) { var deleteAction = self.findFileEl(file).find('.action.delete'); - deleteAction.removeClass('progress-icon').addClass('icon-delete'); + deleteAction.removeClass('icon-loading-small').addClass('icon-delete'); }); } } diff --git a/apps/files/tests/js/filelistSpec.js b/apps/files/tests/js/filelistSpec.js index e1bc2a58b119ed1043799f69645520ad39287db2..94b52b395e56e116f30ce137186308fa57f9bbc9 100644 --- a/apps/files/tests/js/filelistSpec.js +++ b/apps/files/tests/js/filelistSpec.js @@ -421,15 +421,15 @@ describe('OCA.Files.FileList tests', function() { fileList.setFiles(testFiles); doDelete(); - expect(fileList.findFileEl('One.txt').find('.progress-icon:not(.icon-delete)').length).toEqual(1); - expect(fileList.findFileEl('Three.pdf').find('.icon-delete:not(.progress-icon)').length).toEqual(1); + expect(fileList.findFileEl('One.txt').find('.icon-loading-small:not(.icon-delete)').length).toEqual(1); + expect(fileList.findFileEl('Three.pdf').find('.icon-delete:not(.icon-loading-small)').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(.icon-delete)').length).toEqual(4); + expect(fileList.$fileList.find('tr .icon-loading-small:not(.icon-delete)').length).toEqual(4); }); it('updates summary when deleting last file', function() { var $summary; diff --git a/apps/files_trashbin/js/app.js b/apps/files_trashbin/js/app.js index 0afa871bc9ce91bd2a3b1d936e8545bfcfb14791..376ee7b01ca578bf1444007b2609fcc655252d66 100644 Binary files a/apps/files_trashbin/js/app.js and b/apps/files_trashbin/js/app.js differ diff --git a/apps/files_trashbin/js/filelist.js b/apps/files_trashbin/js/filelist.js index fbf5b3f88d59a14cc32f662dbb452c4c97224a1f..b8688d8976563fcfa4ebf987a18265291d136fb3 100644 Binary files a/apps/files_trashbin/js/filelist.js and b/apps/files_trashbin/js/filelist.js differ