summaryrefslogtreecommitdiffstats
path: root/apps/files/js
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2016-05-30 16:03:36 +0200
committerVincent Petry <pvince81@owncloud.com>2016-05-30 16:03:36 +0200
commit76c0bc29fe2caaddce4e21b80b51781969287eb9 (patch)
treeb34e6ef0dd3b9713a1a4874a8aae03a433f50908 /apps/files/js
parent0e3a0e0fdb17938d473434d94e3c16c1c5dccf73 (diff)
parent56241afad790a05bf7d5e2eeedb4ebc05de2cfa7 (diff)
downloadnextcloud-server-76c0bc29fe2caaddce4e21b80b51781969287eb9.tar.gz
nextcloud-server-76c0bc29fe2caaddce4e21b80b51781969287eb9.zip
Merge pull request #20150 from pellaeon/pr-droppable-hover-visual-cue
Add visual cue when moving draggable item over droppable item,
Diffstat (limited to 'apps/files/js')
-rw-r--r--apps/files/js/breadcrumb.js3
-rw-r--r--apps/files/js/filelist.js2
2 files changed, 3 insertions, 2 deletions
diff --git a/apps/files/js/breadcrumb.js b/apps/files/js/breadcrumb.js
index 58ac9924ef7..98de7aa374c 100644
--- a/apps/files/js/breadcrumb.js
+++ b/apps/files/js/breadcrumb.js
@@ -133,7 +133,8 @@
drop: this.onDrop,
over: this.onOver,
out: this.onOut,
- tolerance: 'pointer'
+ tolerance: 'pointer',
+ hoverClass: 'canDrop'
});
}
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 38b9007d0bc..f249f2d35c9 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -1320,7 +1320,7 @@
}
// allow dropping on folders
if (this._folderDropOptions && mime === 'httpd/unix-directory') {
- filenameTd.droppable(this._folderDropOptions);
+ tr.droppable(this._folderDropOptions);
}
if (options.hidden) {