summaryrefslogtreecommitdiffstats
path: root/apps/files/js/filelist.js
diff options
context:
space:
mode:
Diffstat (limited to 'apps/files/js/filelist.js')
-rw-r--r--apps/files/js/filelist.js13
1 files changed, 13 insertions, 0 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 9395112bce3..ef29a4844bf 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -271,6 +271,12 @@
// if dropping on folders is allowed, then also allow on breadcrumbs
if (this._folderDropOptions) {
breadcrumbOptions.onDrop = _.bind(this._onDropOnBreadCrumb, this);
+ breadcrumbOptions.onOver = function() {
+ self.$el.find('td.filename.ui-droppable').droppable('disable');
+ }
+ breadcrumbOptions.onOut = function() {
+ self.$el.find('td.filename.ui-droppable').droppable('enable');
+ }
}
this.breadcrumb = new OCA.Files.BreadCrumb(breadcrumbOptions);
@@ -785,6 +791,13 @@
}
this.move(_.pluck(files, 'name'), targetPath);
+
+ // re-enable td elements to be droppable
+ // sometimes the filename drop handler is still called after re-enable,
+ // it seems that waiting for a short time before re-enabling solves the problem
+ setTimeout(function() {
+ self.$el.find('td.filename.ui-droppable').droppable('enable');
+ }, 10);
},
/**