From 91d9d45c6c55d5ee2f44567893cf96d034aaed1e Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Mon, 22 Sep 2014 18:17:33 +0200
Subject: [PATCH] correct delete-icon to icon-delete, fix #11128
---
apps/files/js/fileactions.js | 2 +-
apps/files/js/filelist.js | 6 +++---
apps/files/tests/js/filelistSpec.js | 6 +++---
apps/files_trashbin/js/app.js | Bin 2464 -> 2464 bytes
apps/files_trashbin/js/filelist.js | Bin 7119 -> 7119 bytes
core/css/fixes.css | 4 ++--
tests/acceptance/tests/pages/files.page.js | 2 +-
7 files changed, 10 insertions(+), 10 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;
diff --git a/apps/files_trashbin/js/app.js b/apps/files_trashbin/js/app.js
index c59a132b8c4475ea4b466441ce6d7eb188229007..0afa871bc9ce91bd2a3b1d936e8545bfcfb14791 100644
GIT binary patch
delta 45
rcmZ1=yg+!vQWoya<orC{l+>KmlGM!`SmrY!3rya?lDqjh`%Ojwhk+4)
delta 45
rcmZ1=yg+!vQWox%)ST3kRNc(v{JhN@SmrY!3rya?lDqjh`%Ojwhz${c
diff --git a/apps/files_trashbin/js/filelist.js b/apps/files_trashbin/js/filelist.js
index 826c1bd64d51a633ec34c4fa10cbb8a3682af3fa..fbf5b3f88d59a14cc32f662dbb452c4c97224a1f 100644
GIT binary patch
delta 45
rcmX?ae%^e8tRQ!0a(<p}N@`AON$O-PG4;*<f)7}b1vguXO=SfDe_IeS
delta 45
rcmX?ae%^e8tRQzvYEEiNs%~a-e%@p&G4;*<f)7}b1vguXO=SfDf9DV}
diff --git a/core/css/fixes.css b/core/css/fixes.css
index 5aba741b64b..0f1584c623f 100644
--- 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 8efe33ee99a..e5445309b26 100644
--- 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 ===============================================//
--
GitLab