correct delete-icon to icon-delete, fix #11128

diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index 4aefd61a19a005c3265c1bf16cf7b4759e9e17f5..8ae0d8f1b2ec58b32909b3d46a995dee4bd82838 100644 (file)
--- 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 1aabfb91f1f16959e7bd659f0d32dc87fb4f842b..4567052b2a982871423dfa17663a3f4bdb69109b 100644 (file)
--- 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 65a89ef85cd0f5ac7d4c7c346d00a4396fc62f09..e1bc2a58b119ed1043799f69645520ad39287db2 100644 (file)
--- 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;

diff --git a/apps/files_trashbin/js/app.js b/apps/files_trashbin/js/app.js
index c59a132b8c4475ea4b466441ce6d7eb188229007..0afa871bc9ce91bd2a3b1d936e8545bfcfb14791 100644 (file)
--- a/apps/files_trashbin/js/app.js
+++ b/apps/files_trashbin/js/app.js
@@ -41,7 +41,7 @@ OCA.Trashbin.App = {
                        var fileList = context.fileList;
                        var tr = fileList.findFileEl(filename);
                        var deleteAction = tr.children("td.date").children(".action.delete");
-                       deleteAction.removeClass('delete-icon').addClass('progress-icon');
+                       deleteAction.removeClass('icon-delete').addClass('progress-icon');
                        fileList.disableActions();
                        $.post(OC.filePath('files_trashbin', 'ajax', 'undelete.php'), {
                                        files: JSON.stringify([filename]),
@@ -58,7 +58,7 @@ OCA.Trashbin.App = {
                        $('.tipsy').remove();
                        var tr = fileList.findFileEl(filename);
                        var deleteAction = tr.children("td.date").children(".action.delete");
-                       deleteAction.removeClass('delete-icon').addClass('progress-icon');
+                       deleteAction.removeClass('icon-delete').addClass('progress-icon');
                        fileList.disableActions();
                        $.post(OC.filePath('files_trashbin', 'ajax', 'delete.php'), {
                                        files: JSON.stringify([filename]),

diff --git a/apps/files_trashbin/js/filelist.js b/apps/files_trashbin/js/filelist.js
index 826c1bd64d51a633ec34c4fa10cbb8a3682af3fa..fbf5b3f88d59a14cc32f662dbb452c4c97224a1f 100644 (file)
--- a/apps/files_trashbin/js/filelist.js
+++ b/apps/files_trashbin/js/filelist.js
@@ -148,7 +148,7 @@
                                files = _.pluck(this.getSelectedFiles(), 'name');
                                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');
                                }
                                params = {
                                        files: JSON.stringify(files),
@@ -202,7 +202,7 @@
                        else {
                                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');
                                }
                        }
 

diff --git a/core/css/fixes.css b/core/css/fixes.css
index 5aba741b64b50e07fe78966ef4800f02bad38f60..0f1584c623fcbc1ba25f06ff6fb3e3ab286824bc 100644 (file)
--- a/core/css/fixes.css
+++ b/core/css/fixes.css
@@ -15,8 +15,8 @@ select {
     font-family: Frutiger, Calibri, 'Myriad Pro', Myriad, Arial, sans-serif;
 }
 
-.lte8 .delete-icon { background-image: url('../img/actions/delete.png'); }
-.lte8 .delete-icon:hover, .delete-icon:focus {
+.lte8 .icon-delete { background-image: url('../img/actions/delete.png'); }
+.lte8 .icon-delete:hover, .icon-delete:focus {
        background-image: url('../img/actions/delete-hover.png');
 }
 

diff --git a/tests/acceptance/tests/pages/files.page.js b/tests/acceptance/tests/pages/files.page.js
index 8efe33ee99a7079a7931dff0f0dbf9ed5b2b4f77..e5445309b266a8305c25ca1e078bbb83068955ea 100644 (file)
--- a/tests/acceptance/tests/pages/files.page.js
+++ b/tests/acceptance/tests/pages/files.page.js
@@ -78,7 +78,7 @@
   };
 
   FilesPage.prototype.deleteButtonId = function(fileName) {
-    return by.css("tr[data-file='" + fileName +  "'] .action.delete.delete-icon");
+    return by.css("tr[data-file='" + fileName +  "'] .action.delete.icon-delete");
   };
 
 //================ SHARED ===============================================//