summaryrefslogtreecommitdiff
path: root/packages/client/src/components
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2021-12-05 13:10:19 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2021-12-05 13:10:19 +0900
commitfbe4869d1ed336d3fb7d08d3d2f75710eb0fb1a4 (patch)
tree15b0257d2c6e51d015bf5780e4b2f82147eac351 /packages/client/src/components
parentFix(client): APIコンソールで with credential がオフだとiが付与... (diff)
downloadmisskey-fbe4869d1ed336d3fb7d08d3d2f75710eb0fb1a4.tar.gz
misskey-fbe4869d1ed336d3fb7d08d3d2f75710eb0fb1a4.tar.bz2
misskey-fbe4869d1ed336d3fb7d08d3d2f75710eb0fb1a4.zip
fix(client): タッチ機能付きディスプレイを使っていてマウス操作をしている場合に一部機能が動作しない問題を修正
Diffstat (limited to 'packages/client/src/components')
-rw-r--r--packages/client/src/components/emoji-picker.vue6
-rw-r--r--packages/client/src/components/global/url.vue6
-rw-r--r--packages/client/src/components/link.vue6
3 files changed, 9 insertions, 9 deletions
diff --git a/packages/client/src/components/emoji-picker.vue b/packages/client/src/components/emoji-picker.vue
index 6695c236e7..180aff87ac 100644
--- a/packages/client/src/components/emoji-picker.vue
+++ b/packages/client/src/components/emoji-picker.vue
@@ -79,7 +79,7 @@ import { emojilist } from '@/scripts/emojilist';
import { getStaticImageUrl } from '@/scripts/get-static-image-url';
import Particle from '@/components/particle.vue';
import * as os from '@/os';
-import { isDeviceTouch } from '@/scripts/is-device-touch';
+import { isTouchUsing } from '@/scripts/touch';
import { isMobile } from '@/scripts/is-mobile';
import { emojiCategories } from '@/instance';
import XSection from './emoji-picker.section.vue';
@@ -108,7 +108,7 @@ export default defineComponent({
pinned: this.$store.reactiveState.reactions,
width: this.asReactionPicker ? this.$store.state.reactionPickerWidth : 3,
height: this.asReactionPicker ? this.$store.state.reactionPickerHeight : 2,
- big: this.asReactionPicker ? isDeviceTouch : false,
+ big: this.asReactionPicker ? isTouchUsing : false,
customEmojiCategories: emojiCategories,
customEmojis: this.$instance.emojis,
q: null,
@@ -268,7 +268,7 @@ export default defineComponent({
methods: {
focus() {
- if (!isMobile && !isDeviceTouch) {
+ if (!isMobile && !isTouchUsing) {
this.$refs.search.focus({
preventScroll: true
});
diff --git a/packages/client/src/components/global/url.vue b/packages/client/src/components/global/url.vue
index 4987c2b61c..097fcddef6 100644
--- a/packages/client/src/components/global/url.vue
+++ b/packages/client/src/components/global/url.vue
@@ -23,7 +23,7 @@
import { defineComponent } from 'vue';
import { toUnicode as decodePunycode } from 'punycode/';
import { url as local } from '@/config';
-import { isDeviceTouch } from '@/scripts/is-device-touch';
+import { isTouchUsing } from '@/scripts/touch';
import * as os from '@/os';
export default defineComponent({
@@ -91,13 +91,13 @@ export default defineComponent({
}
},
onMouseover() {
- if (isDeviceTouch) return;
+ if (isTouchUsing) return;
clearTimeout(this.showTimer);
clearTimeout(this.hideTimer);
this.showTimer = setTimeout(this.showPreview, 500);
},
onMouseleave() {
- if (isDeviceTouch) return;
+ if (isTouchUsing) return;
clearTimeout(this.showTimer);
clearTimeout(this.hideTimer);
this.hideTimer = setTimeout(this.closePreview, 500);
diff --git a/packages/client/src/components/link.vue b/packages/client/src/components/link.vue
index 5a6754016e..8b8cde6510 100644
--- a/packages/client/src/components/link.vue
+++ b/packages/client/src/components/link.vue
@@ -12,7 +12,7 @@
<script lang="ts">
import { defineComponent } from 'vue';
import { url as local } from '@/config';
-import { isDeviceTouch } from '@/scripts/is-device-touch';
+import { isTouchUsing } from '@/scripts/touch';
import * as os from '@/os';
export default defineComponent({
@@ -65,13 +65,13 @@ export default defineComponent({
}
},
onMouseover() {
- if (isDeviceTouch) return;
+ if (isTouchUsing) return;
clearTimeout(this.showTimer);
clearTimeout(this.hideTimer);
this.showTimer = setTimeout(this.showPreview, 500);
},
onMouseleave() {
- if (isDeviceTouch) return;
+ if (isTouchUsing) return;
clearTimeout(this.showTimer);
clearTimeout(this.hideTimer);
this.hideTimer = setTimeout(this.closePreview, 500);