summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2021-01-11 18:49:39 +0900
committersyuilo <syuilotan@yahoo.co.jp>2021-01-11 18:49:39 +0900
commit1286dee1ab299a0e98cd252e5f2fa030fad07496 (patch)
treebcfae0bc54fa58dcfb9744ec9e7ebb552be98f7d /src
parentImprove theme editor (diff)
downloadsharkey-1286dee1ab299a0e98cd252e5f2fa030fad07496.tar.gz
sharkey-1286dee1ab299a0e98cd252e5f2fa030fad07496.tar.bz2
sharkey-1286dee1ab299a0e98cd252e5f2fa030fad07496.zip
fix context menu
Diffstat (limited to 'src')
-rw-r--r--src/client/components/drive.vue2
-rw-r--r--src/client/ui/deck/main-column.vue1
-rw-r--r--src/client/ui/default.vue1
3 files changed, 3 insertions, 1 deletions
diff --git a/src/client/components/drive.vue b/src/client/components/drive.vue
index 64e4d51e23..1dbb1cbc16 100644
--- a/src/client/components/drive.vue
+++ b/src/client/components/drive.vue
@@ -17,7 +17,7 @@
@dragenter="onDragenter"
@dragleave="onDragleave"
@drop.prevent.stop="onDrop"
- @contextmenu="onContextmenu"
+ @contextmenu.stop="onContextmenu"
>
<div class="contents" ref="contents">
<div class="folders" ref="foldersContainer" v-show="folders.length > 0">
diff --git a/src/client/ui/deck/main-column.vue b/src/client/ui/deck/main-column.vue
index c09880d68a..f0d5567b6e 100644
--- a/src/client/ui/deck/main-column.vue
+++ b/src/client/ui/deck/main-column.vue
@@ -58,6 +58,7 @@ export default defineComponent({
onContextmenu(e) {
if (['INPUT', 'TEXTAREA'].includes(e.target.tagName) || e.target.attributes['contenteditable']) return;
+ if (window.getSelection().toString() !== '') return;
const path = this.$route.path;
os.contextMenu([{
type: 'label',
diff --git a/src/client/ui/default.vue b/src/client/ui/default.vue
index 0da4108209..7626ddaa58 100644
--- a/src/client/ui/default.vue
+++ b/src/client/ui/default.vue
@@ -188,6 +188,7 @@ export default defineComponent({
onContextmenu(e) {
if (['INPUT', 'TEXTAREA'].includes(e.target.tagName) || e.target.attributes['contenteditable']) return;
+ if (window.getSelection().toString() !== '') return;
const path = this.$route.path;
os.contextMenu([{
type: 'label',