From ccf063709e7a33a6690f84a19acbbf9ef0209efe Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 24 Apr 2021 22:36:28 +0900 Subject: [PATCH] Tweak UI --- src/client/components/tab.vue | 6 ++++-- src/client/ui/chat/index.vue | 2 +- src/client/ui/deck/main-column.vue | 2 +- src/client/ui/default.vue | 2 +- src/client/ui/universal.vue | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/client/components/tab.vue b/src/client/components/tab.vue index 96cbe50fb..5e54fc968 100644 --- a/src/client/components/tab.vue +++ b/src/client/components/tab.vue @@ -12,14 +12,16 @@ export default defineComponent({ return withDirectives(h('div', { class: 'pxhvhrfw', - }, options.map(option => h('button', { + }, options.map(option => withDirectives(h('button', { class: ['_button', { active: this.value === option.props.value }], key: option.props.value, disabled: this.value === option.props.value, onClick: () => { this.$emit('update:value', option.props.value); } - }, option.children))), [ + }, option.children), [ + [resolveDirective('click-anime')] + ]))), [ [resolveDirective('size'), { max: [500] }] ]); } diff --git a/src/client/ui/chat/index.vue b/src/client/ui/chat/index.vue index b498d70a7..be1bd7758 100644 --- a/src/client/ui/chat/index.vue +++ b/src/client/ui/chat/index.vue @@ -313,7 +313,7 @@ export default defineComponent({ } }; if (isLink(e.target)) return; - if (['INPUT', 'TEXTAREA'].includes(e.target.tagName) || e.target.attributes['contenteditable']) return; + if (['INPUT', 'TEXTAREA', 'IMG'].includes(e.target.tagName) || e.target.attributes['contenteditable']) return; if (window.getSelection().toString() !== '') return; const path = this.$route.path; os.contextMenu([{ diff --git a/src/client/ui/deck/main-column.vue b/src/client/ui/deck/main-column.vue index 75cf94aae..de36fd596 100644 --- a/src/client/ui/deck/main-column.vue +++ b/src/client/ui/deck/main-column.vue @@ -64,7 +64,7 @@ export default defineComponent({ } }; if (isLink(e.target)) return; - if (['INPUT', 'TEXTAREA'].includes(e.target.tagName) || e.target.attributes['contenteditable']) return; + if (['INPUT', 'TEXTAREA', 'IMG'].includes(e.target.tagName) || e.target.attributes['contenteditable']) return; if (window.getSelection().toString() !== '') return; const path = this.$route.path; os.contextMenu([{ diff --git a/src/client/ui/default.vue b/src/client/ui/default.vue index 0cc969272..6cfb68071 100644 --- a/src/client/ui/default.vue +++ b/src/client/ui/default.vue @@ -165,7 +165,7 @@ export default defineComponent({ } }; if (isLink(e.target)) return; - if (['INPUT', 'TEXTAREA'].includes(e.target.tagName) || e.target.attributes['contenteditable']) return; + if (['INPUT', 'TEXTAREA', 'IMG'].includes(e.target.tagName) || e.target.attributes['contenteditable']) return; if (window.getSelection().toString() !== '') return; const path = this.$route.path; os.contextMenu([{ diff --git a/src/client/ui/universal.vue b/src/client/ui/universal.vue index a44dfc42f..478fa1307 100644 --- a/src/client/ui/universal.vue +++ b/src/client/ui/universal.vue @@ -191,7 +191,7 @@ export default defineComponent({ } }; if (isLink(e.target)) return; - if (['INPUT', 'TEXTAREA'].includes(e.target.tagName) || e.target.attributes['contenteditable']) return; + if (['INPUT', 'TEXTAREA', 'IMG'].includes(e.target.tagName) || e.target.attributes['contenteditable']) return; if (window.getSelection().toString() !== '') return; const path = this.$route.path; os.contextMenu([{