aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files/js
diff options
context:
space:
mode:
Diffstat (limited to 'apps/files/js')
-rw-r--r--apps/files/js/filelist.js9
-rw-r--r--apps/files/js/files.js4
2 files changed, 9 insertions, 4 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index e7becb01207..eb46f155269 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -608,6 +608,7 @@
* Event handler when dropping on a breadcrumb
*/
_onDropOnBreadCrumb: function( event, ui ) {
+ var self = this;
var $target = $(event.target);
if (!$target.is('.crumb')) {
$target = $target.closest('.crumb');
@@ -629,7 +630,9 @@
var files = this.getSelectedFiles();
if (files.length === 0) {
// single one selected without checkbox?
- files = _.map(ui.helper.find('tr'), this.elementToFile);
+ files = _.map(ui.helper.find('tr'), function(el) {
+ return self.elementToFile($(el));
+ });
}
this.move(_.pluck(files, 'name'), targetPath);
@@ -1748,7 +1751,7 @@
// no files passed, delete all in current dir
params.allfiles = true;
// show spinner for all files
- this.$fileList.find('tr').addClass('busy');
+ this.showFileBusyState(this.$fileList.find('tr'), true);
}
$.post(OC.filePath('files', 'ajax', 'delete.php'),
@@ -1791,7 +1794,7 @@
}
else {
$.each(files,function(index,file) {
- self.$fileList.find('tr').removeClass('busy');
+ self.showFileBusyState(file, false);
});
}
}
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 90c8ee67757..245648a79e2 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -453,7 +453,9 @@ var folderDropOptions = {
var files = FileList.getSelectedFiles();
if (files.length === 0) {
// single one selected without checkbox?
- files = _.map(ui.helper.find('tr'), FileList.elementToFile);
+ files = _.map(ui.helper.find('tr'), function(el) {
+ return FileList.elementToFile($(el));
+ });
}
FileList.move(_.pluck(files, 'name'), targetPath);