From 33fe24dc3d12868d79f9b137e9e91eba2b3e5028 Mon Sep 17 00:00:00 2001
From: Victor Dubiniuk <victor.dubiniuk@gmail.com>
Date: Mon, 29 Jul 2013 19:27:11 +0300
Subject: Replace delete icon with spinner

---
 apps/files/js/filelist.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'apps/files/js/filelist.js')

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');
 						});
 					}
 				});
-- 
cgit v1.2.3


From 1a1c100719643c6056541ffd208642e9f1653c95 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Tue, 30 Jul 2013 10:44:01 +0200
Subject: fix loading.gif size for both upload and deletion, force visiblity

---
 apps/files/js/filelist.js | 2 +-
 core/css/styles.css       | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'apps/files/js/filelist.js')

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index dc820dc93e2..e483626a91a 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -15,7 +15,7 @@ var FileList={
 		// filename td
 		td = $('<td></td>').attr({
 			"class": "filename",
-			"style": 'background-image:url('+iconurl+')'
+			"style": 'background-image:url('+iconurl+'); background-size: 16px;'
 		});
 		td.append('<input type="checkbox" />');
 		var link_elem = $('<a></a>').attr({
diff --git a/core/css/styles.css b/core/css/styles.css
index 365de759fdc..3af1a311585 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -669,7 +669,13 @@ 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'); }
+.progress-icon {
+	background-image: url('../img/loading.gif');
+	background-size: 16px;
+	/* force show the loading icon, not only on hover */
+	opacity: 1 !important;
+	display: inline !important;
+}
 
 /* buttons */
 button.loading {
-- 
cgit v1.2.3