From 2ac953e6a8949259b54f700cd6f9bc7eb48aadd5 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Mon, 22 Sep 2014 18:24:32 +0200
Subject: [PATCH] correct progress-icon to icon-loading-small
---
apps/files/js/filelist.js | 6 +++---
apps/files/tests/js/filelistSpec.js | 6 +++---
apps/files_trashbin/js/app.js | Bin 2464 -> 2474 bytes
apps/files_trashbin/js/filelist.js | Bin 7119 -> 7129 bytes
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 4567052b2a9..86cba29e76c 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('icon-delete').addClass('progress-icon');
+ deleteAction.removeClass('icon-delete').addClass('icon-loading-small');
}
}
// 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('icon-delete').addClass('progress-icon');
+ this.$fileList.find('tr>td.date .action.delete').removeClass('icon-delete').addClass('icon-loading-small');
}
$.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('icon-delete');
+ deleteAction.removeClass('icon-loading-small').addClass('icon-delete');
});
}
}
diff --git a/apps/files/tests/js/filelistSpec.js b/apps/files/tests/js/filelistSpec.js
index e1bc2a58b11..94b52b395e5 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(.icon-delete)').length).toEqual(1);
- expect(fileList.findFileEl('Three.pdf').find('.icon-delete:not(.progress-icon)').length).toEqual(1);
+ expect(fileList.findFileEl('One.txt').find('.icon-loading-small:not(.icon-delete)').length).toEqual(1);
+ expect(fileList.findFileEl('Three.pdf').find('.icon-delete:not(.icon-loading-small)').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(.icon-delete)').length).toEqual(4);
+ expect(fileList.$fileList.find('tr .icon-loading-small: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 0afa871bc9ce91bd2a3b1d936e8545bfcfb14791..376ee7b01ca578bf1444007b2609fcc655252d66 100644
GIT binary patch
delta 59
ycmZ1=yh?b(UKXLu<orC{oczR;%)E5n;@rfXoXw|L<}zUspL~iXc=K`gn~VUd-WMqV
delta 49
tcmZ1_yg+!vUKZYhqWtut)Z${@%;fyM&F5L>GNB4hKF<=o`6ByGMgZrI6V(6!
diff --git a/apps/files_trashbin/js/filelist.js b/apps/files_trashbin/js/filelist.js
index fbf5b3f88d59a14cc32f662dbb452c4c97224a1f..b8688d8976563fcfa4ebf987a18265291d136fb3 100644
GIT binary patch
delta 55
scmX?ae$#w|si071a(<p}PJUuaW?s5(ac*Kx&Sob;R#t4{A!60606Uoz(f|Me
delta 45
ncmca<e%^e8sUUAbQGR++YH_h{W^#VsW_LkWRy3hFv1(QTicb)E
--
GitLab