summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Christoph Borchardt <hey@jancborchardt.net>2014-09-22 18:24:32 +0200
committerJan-Christoph Borchardt <hey@jancborchardt.net>2014-09-22 18:24:32 +0200
commit2ac953e6a8949259b54f700cd6f9bc7eb48aadd5 (patch)
treefe843598651fc68e12feb48489b657a0cf484e33
parent91d9d45c6c55d5ee2f44567893cf96d034aaed1e (diff)
downloadnextcloud-server-2ac953e6a8949259b54f700cd6f9bc7eb48aadd5.tar.gz
nextcloud-server-2ac953e6a8949259b54f700cd6f9bc7eb48aadd5.zip
correct progress-icon to icon-loading-small
-rw-r--r--apps/files/js/filelist.js6
-rw-r--r--apps/files/tests/js/filelistSpec.js6
-rw-r--r--apps/files_trashbin/js/app.js4
-rw-r--r--apps/files_trashbin/js/filelist.js4
4 files changed, 10 insertions, 10 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 0afa871bc9c..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('icon-delete').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('icon-delete').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 fbf5b3f88d5..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('icon-delete').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('icon-delete').addClass('progress-icon');
+ deleteAction.removeClass('icon-delete').addClass('icon-loading-small');
}
}