summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/files/js/filelist.js8
-rw-r--r--core/css/styles.css4
2 files changed, 5 insertions, 7 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 04a9fb91649..dc820dc93e2 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -371,9 +371,7 @@ var FileList={
}
for (var i=0; i<files.length; i++) {
var deleteAction = $('tr').filterAttr('data-file',files[i]).children("td.date").children(".action.delete");
- var oldHTML = deleteAction.html();
- var newHTML = '<img class="move2trash" data-action="Delete" title="'+t('files', 'perform delete operation')+'" src="'+ OC.imagePath('core', 'loading.gif') +'"></a>';
- deleteAction.html(newHTML);
+ deleteAction.removeClass('delete-icon').addClass('progress-icon');
}
// Finish any existing actions
if (FileList.lastAction) {
@@ -394,8 +392,8 @@ var FileList={
procesSelection();
} else {
$.each(files,function(index,file) {
- var deleteAction = $('tr').filterAttr('data-file',file).children("td.date").children(".move2trash");
- deleteAction.html(oldHTML);
+ var deleteAction = $('tr').filterAttr('data-file',files[i]).children("td.date").children(".action.delete");
+ deleteAction.removeClass('progress-icon').addClass('delete-icon');
});
}
});
diff --git a/core/css/styles.css b/core/css/styles.css
index 490619c00d4..365de759fdc 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -659,7 +659,7 @@ div.crumb:active {
}
/* icons */
-.folder-icon, .delete-icon, .edit-icon {
+.folder-icon, .delete-icon, .edit-icon, .progress-icon {
background-repeat: no-repeat;
background-position: center;
}
@@ -669,7 +669,7 @@ div.crumb:active {
background-image: url('../img/actions/delete-hover.svg');
}
.edit-icon { background-image: url('../img/actions/rename.svg'); }
-
+.progress-icon { background-image: url('../img/loading.gif'); }
/* buttons */
button.loading {