diff options
Diffstat (limited to 'apps/files')
| -rw-r--r-- | apps/files/js/fileactions.js | 2 | ||||
| -rw-r--r-- | apps/files/js/filelist.js | 6 | ||||
| -rw-r--r-- | apps/files/tests/js/filelistSpec.js | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js index 4aefd61a19a..8ae0d8f1b2e 100644 --- a/apps/files/js/fileactions.js +++ b/apps/files/js/fileactions.js @@ -304,7 +304,7 @@ if (img.call) { img = img(file); } - html = '<a href="#" original-title="' + escapeHTML(deleteTitle) + '" class="action delete delete-icon" />'; + html = '<a href="#" original-title="' + escapeHTML(deleteTitle) + '" class="action delete icon-delete" />'; var element = $(html); element.data('action', actions['Delete']); element.on('click', {a: null, elem: parent, actionFunc: actions['Delete'].action}, actionHandler); diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 1aabfb91f1f..4567052b2a9 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('delete-icon').addClass('progress-icon'); + deleteAction.removeClass('icon-delete').addClass('progress-icon'); } } // 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('delete-icon').addClass('progress-icon'); + this.$fileList.find('tr>td.date .action.delete').removeClass('icon-delete').addClass('progress-icon'); } $.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('delete-icon'); + deleteAction.removeClass('progress-icon').addClass('icon-delete'); }); } } diff --git a/apps/files/tests/js/filelistSpec.js b/apps/files/tests/js/filelistSpec.js index 65a89ef85cd..e1bc2a58b11 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(.delete-icon)').length).toEqual(1); - expect(fileList.findFileEl('Three.pdf').find('.delete-icon:not(.progress-icon)').length).toEqual(1); + 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); }); 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); + expect(fileList.$fileList.find('tr .progress-icon:not(.icon-delete)').length).toEqual(4); }); it('updates summary when deleting last file', function() { var $summary; |