summaryrefslogtreecommitdiffstats
path: root/apps/files_trashbin
diff options
context:
space:
mode:
authorJan-Christoph Borchardt <hey@jancborchardt.net>2014-09-23 12:39:06 +0200
committerJan-Christoph Borchardt <hey@jancborchardt.net>2014-09-23 12:39:06 +0200
commita062db4fd02feb1a0eff48eb130da7cc48c49899 (patch)
treeb0f7cd1bc321475363fbf897695c4f6824cd3c4a /apps/files_trashbin
parent75593f87d547b8e24105ec18434bf5bdd0aa3447 (diff)
parent1583ae1ed65ca788868f5cb3e0e20d3f8b7b59dd (diff)
downloadnextcloud-server-a062db4fd02feb1a0eff48eb130da7cc48c49899.tar.gz
nextcloud-server-a062db4fd02feb1a0eff48eb130da7cc48c49899.zip
Merge pull request #11234 from owncloud/fix-icon-classes
Fix icon classes, disappeared delete icon
Diffstat (limited to 'apps/files_trashbin')
-rw-r--r--apps/files_trashbin/js/app.js4
-rw-r--r--apps/files_trashbin/js/filelist.js4
2 files changed, 4 insertions, 4 deletions
diff --git a/apps/files_trashbin/js/app.js b/apps/files_trashbin/js/app.js
index c59a132b8c4..376ee7b01ca 100644
--- 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('icon-loading-small');
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('icon-loading-small');
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 826c1bd64d5..b8688d89765 100644
--- 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('icon-loading-small');
}
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('icon-loading-small');
}
}