diff options
Diffstat (limited to 'apps/files/js')
| -rw-r--r-- | apps/files/js/breadcrumb.js | 6 | ||||
| -rw-r--r-- | apps/files/js/filelist.js | 13 |
2 files changed, 19 insertions, 0 deletions
diff --git a/apps/files/js/breadcrumb.js b/apps/files/js/breadcrumb.js index 364475e4a4f..58ac9924ef7 100644 --- a/apps/files/js/breadcrumb.js +++ b/apps/files/js/breadcrumb.js @@ -39,6 +39,8 @@ } if (options.onDrop) { this.onDrop = options.onDrop; + this.onOver = options.onOver; + this.onOut = options.onOut; } if (options.getCrumbUrl) { this.getCrumbUrl = options.getCrumbUrl; @@ -60,6 +62,8 @@ breadcrumbs: [], onClick: null, onDrop: null, + onOver: null, + onOut: null, /** * Sets the directory to be displayed as breadcrumb. @@ -127,6 +131,8 @@ if (this.onDrop) { this.$el.find('.crumb:not(.last)').droppable({ drop: this.onDrop, + over: this.onOver, + out: this.onOut, tolerance: 'pointer' }); } 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); }, /** |