diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2018-02-27 06:35:16 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2018-02-27 06:35:16 +0900 |
| commit | 0bbb15afbbb78e7ce4ec52664c5c6f0b83e18dca (patch) | |
| tree | e0f04969965b41e70ed0427726a0368fd67cb2bc /src/web/app | |
| parent | v3910 (diff) | |
| download | sharkey-0bbb15afbbb78e7ce4ec52664c5c6f0b83e18dca.tar.gz sharkey-0bbb15afbbb78e7ce4ec52664c5c6f0b83e18dca.tar.bz2 sharkey-0bbb15afbbb78e7ce4ec52664c5c6f0b83e18dca.zip | |
:v:
Diffstat (limited to 'src/web/app')
| -rw-r--r-- | src/web/app/desktop/views/components/drive.nav-folder.vue | 5 | ||||
| -rw-r--r-- | src/web/app/desktop/views/components/drive.vue | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/web/app/desktop/views/components/drive.nav-folder.vue b/src/web/app/desktop/views/components/drive.nav-folder.vue index a5677dcb4d..dfbf116bff 100644 --- a/src/web/app/desktop/views/components/drive.nav-folder.vue +++ b/src/web/app/desktop/views/components/drive.nav-folder.vue @@ -52,6 +52,8 @@ export default Vue.extend({ } else { e.dataTransfer.dropEffect = 'none'; } + + return false; }, onDragenter() { if (this.folder || this.browser.folder) this.draghover = true; @@ -102,6 +104,9 @@ export default Vue.extend({ <style lang="stylus" scoped> .root.nav-folder + > * + pointer-events none + &[data-draghover] background #eee diff --git a/src/web/app/desktop/views/components/drive.vue b/src/web/app/desktop/views/components/drive.vue index 7c4b08d3f0..1d84c24098 100644 --- a/src/web/app/desktop/views/components/drive.vue +++ b/src/web/app/desktop/views/components/drive.vue @@ -16,7 +16,7 @@ ref="main" @mousedown="onMousedown" @dragover.prevent.stop="onDragover" - @dragenter.prevent="onDragenter" + @dragenter="onDragenter" @dragleave="onDragleave" @drop.prevent.stop="onDrop" @contextmenu.prevent.stop="onContextmenu" @@ -251,6 +251,8 @@ export default Vue.extend({ } else { e.dataTransfer.dropEffect = 'none'; } + + return false; }, onDragenter(e) { |