sim1222/nca10.net
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix(client): タッチ機能付きディスプレイを使っていてマウス操作をしている場合に一部機能が動作しない問題を修正

Browse Source
This commit is contained in:
syuilo
2021-12-05 13:10:19 +09:00
parent b1bd7307bb
commit fbe4869d1e
9 changed files with 40 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/client/src/components/emoji-picker.vue
View File

@ -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
});

6
packages/client/src/components/global/url.vue
View File

@ -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);

6
packages/client/src/components/link.vue
View File

@ -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);