correct progress-icon to icon-loading-small
This commit is contained in:
parent
91d9d45c6c
commit
2ac953e6a8
|
@ -1427,7 +1427,7 @@
|
||||||
if (files) {
|
if (files) {
|
||||||
for (var i=0; i<files.length; i++) {
|
for (var i=0; i<files.length; i++) {
|
||||||
var deleteAction = this.findFileEl(files[i]).children("td.date").children(".action.delete");
|
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
|
// Finish any existing actions
|
||||||
|
@ -1445,7 +1445,7 @@
|
||||||
// no files passed, delete all in current dir
|
// no files passed, delete all in current dir
|
||||||
params.allfiles = true;
|
params.allfiles = true;
|
||||||
// show spinner for all files
|
// 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'),
|
$.post(OC.filePath('files', 'ajax', 'delete.php'),
|
||||||
|
@ -1489,7 +1489,7 @@
|
||||||
else {
|
else {
|
||||||
$.each(files,function(index,file) {
|
$.each(files,function(index,file) {
|
||||||
var deleteAction = self.findFileEl(file).find('.action.delete');
|
var deleteAction = self.findFileEl(file).find('.action.delete');
|
||||||
deleteAction.removeClass('progress-icon').addClass('icon-delete');
|
deleteAction.removeClass('icon-loading-small').addClass('icon-delete');
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -421,15 +421,15 @@ describe('OCA.Files.FileList tests', function() {
|
||||||
fileList.setFiles(testFiles);
|
fileList.setFiles(testFiles);
|
||||||
doDelete();
|
doDelete();
|
||||||
|
|
||||||
expect(fileList.findFileEl('One.txt').find('.progress-icon:not(.icon-delete)').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(.progress-icon)').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() {
|
it('shows spinner on all files when deleting all', function() {
|
||||||
fileList.setFiles(testFiles);
|
fileList.setFiles(testFiles);
|
||||||
|
|
||||||
fileList.do_delete();
|
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() {
|
it('updates summary when deleting last file', function() {
|
||||||
var $summary;
|
var $summary;
|
||||||
|
|
|
@ -41,7 +41,7 @@ OCA.Trashbin.App = {
|
||||||
var fileList = context.fileList;
|
var fileList = context.fileList;
|
||||||
var tr = fileList.findFileEl(filename);
|
var tr = fileList.findFileEl(filename);
|
||||||
var deleteAction = tr.children("td.date").children(".action.delete");
|
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();
|
fileList.disableActions();
|
||||||
$.post(OC.filePath('files_trashbin', 'ajax', 'undelete.php'), {
|
$.post(OC.filePath('files_trashbin', 'ajax', 'undelete.php'), {
|
||||||
files: JSON.stringify([filename]),
|
files: JSON.stringify([filename]),
|
||||||
|
@ -58,7 +58,7 @@ OCA.Trashbin.App = {
|
||||||
$('.tipsy').remove();
|
$('.tipsy').remove();
|
||||||
var tr = fileList.findFileEl(filename);
|
var tr = fileList.findFileEl(filename);
|
||||||
var deleteAction = tr.children("td.date").children(".action.delete");
|
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();
|
fileList.disableActions();
|
||||||
$.post(OC.filePath('files_trashbin', 'ajax', 'delete.php'), {
|
$.post(OC.filePath('files_trashbin', 'ajax', 'delete.php'), {
|
||||||
files: JSON.stringify([filename]),
|
files: JSON.stringify([filename]),
|
||||||
|
|
|
@ -148,7 +148,7 @@
|
||||||
files = _.pluck(this.getSelectedFiles(), 'name');
|
files = _.pluck(this.getSelectedFiles(), 'name');
|
||||||
for (var i = 0; i < files.length; i++) {
|
for (var i = 0; i < files.length; i++) {
|
||||||
var deleteAction = this.findFileEl(files[i]).children("td.date").children(".action.delete");
|
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 = {
|
params = {
|
||||||
files: JSON.stringify(files),
|
files: JSON.stringify(files),
|
||||||
|
@ -202,7 +202,7 @@
|
||||||
else {
|
else {
|
||||||
for (var i = 0; i < files.length; i++) {
|
for (var i = 0; i < files.length; i++) {
|
||||||
var deleteAction = this.findFileEl(files[i]).children("td.date").children(".action.delete");
|
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');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue