summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorかっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>2024-01-18 14:45:11 +0900
committerGitHub <noreply@github.com>2024-01-18 14:45:11 +0900
commit67a41c09ae5924ec97237dc7869de579b5f74510 (patch)
tree7d15f4919a648c09f21d7a96b0fcb88770e00f8f /packages
parentrefactor: MkCodeをブロックとインラインで別コンポーネント... (diff)
downloadmisskey-67a41c09ae5924ec97237dc7869de579b5f74510.tar.gz
misskey-67a41c09ae5924ec97237dc7869de579b5f74510.tar.bz2
misskey-67a41c09ae5924ec97237dc7869de579b5f74510.zip
fix(frontend/MediaVideo): 再生シークバーの当たり判定を調整 (#13027)
* fix(frontend/MediaVideo): 再生シークバーの当たり判定を調整 * fix
Diffstat (limited to '')
-rw-r--r--packages/frontend/src/components/MkMediaAudio.vue6
-rw-r--r--packages/frontend/src/components/MkMediaRange.vue8
-rw-r--r--packages/frontend/src/components/MkMediaVideo.vue7
-rw-r--r--packages/frontend/src/filters/hms.ts2
4 files changed, 14 insertions, 9 deletions
diff --git a/packages/frontend/src/components/MkMediaAudio.vue b/packages/frontend/src/components/MkMediaAudio.vue
index 75b31b9a49..53fd3b2d55 100644
--- a/packages/frontend/src/components/MkMediaAudio.vue
+++ b/packages/frontend/src/components/MkMediaAudio.vue
@@ -138,7 +138,7 @@ const rangePercent = computed({
audioEl.value.currentTime = to * durationMs.value / 1000;
},
});
-const volume = ref(.5);
+const volume = ref(.25);
const bufferedEnd = ref(0);
const bufferedDataRatio = computed(() => {
if (!audioEl.value) return 0;
@@ -161,7 +161,7 @@ function togglePlayPause() {
function toggleMute() {
if (volume.value === 0) {
- volume.value = .5;
+ volume.value = .25;
} else {
volume.value = 0;
}
@@ -207,7 +207,7 @@ function init() {
isActuallyPlaying.value = false;
isPlaying.value = false;
});
-
+
durationMs.value = audioEl.value.duration * 1000;
audioEl.value.addEventListener('durationchange', () => {
if (audioEl.value) {
diff --git a/packages/frontend/src/components/MkMediaRange.vue b/packages/frontend/src/components/MkMediaRange.vue
index e6303a5c41..a150ae9843 100644
--- a/packages/frontend/src/components/MkMediaRange.vue
+++ b/packages/frontend/src/components/MkMediaRange.vue
@@ -5,9 +5,11 @@ SPDX-License-Identifier: AGPL-3.0-only
<!-- Media系専用のinput range -->
<template>
-<div :class="$style.controlsSeekbar" :style="sliderBgWhite ? '--sliderBg: rgba(255,255,255,.25);' : '--sliderBg: var(--scrollbarHandle);'">
- <progress v-if="buffer !== undefined" :class="$style.buffer" :value="isNaN(buffer) ? 0 : buffer" min="0" max="1">{{ Math.round(buffer * 100) }}% buffered</progress>
- <input v-model="model" :class="$style.seek" :style="`--value: ${modelValue * 100}%;`" type="range" min="0" max="1" step="any" @change="emit('dragEnded', modelValue)"/>
+<div :style="sliderBgWhite ? '--sliderBg: rgba(255,255,255,.25);' : '--sliderBg: var(--scrollbarHandle);'">
+ <div :class="$style.controlsSeekbar">
+ <progress v-if="buffer !== undefined" :class="$style.buffer" :value="isNaN(buffer) ? 0 : buffer" min="0" max="1">{{ Math.round(buffer * 100) }}% buffered</progress>
+ <input v-model="model" :class="$style.seek" :style="`--value: ${modelValue * 100}%;`" type="range" min="0" max="1" step="any" @change="emit('dragEnded', modelValue)"/>
+ </div>
</div>
</template>
diff --git a/packages/frontend/src/components/MkMediaVideo.vue b/packages/frontend/src/components/MkMediaVideo.vue
index 977c9020c7..0a113458a1 100644
--- a/packages/frontend/src/components/MkMediaVideo.vue
+++ b/packages/frontend/src/components/MkMediaVideo.vue
@@ -176,7 +176,7 @@ const rangePercent = computed({
videoEl.value.currentTime = to * durationMs.value / 1000;
},
});
-const volume = ref(.5);
+const volume = ref(.25);
const bufferedEnd = ref(0);
const bufferedDataRatio = computed(() => {
if (!videoEl.value) return 0;
@@ -236,7 +236,7 @@ function toggleFullscreen() {
function toggleMute() {
if (volume.value === 0) {
- volume.value = .5;
+ volume.value = .25;
} else {
volume.value = 0;
}
@@ -535,6 +535,9 @@ onDeactivated(() => {
.seekbarRoot {
grid-area: seekbar;
+ /* ▼シークバー操作をやりやすくするためにクリックイベントが伝播されないエリアを拡張する */
+ margin: -10px;
+ padding: 10px;
}
@container (min-width: 500px) {
diff --git a/packages/frontend/src/filters/hms.ts b/packages/frontend/src/filters/hms.ts
index 7b5da965ff..73db7becc2 100644
--- a/packages/frontend/src/filters/hms.ts
+++ b/packages/frontend/src/filters/hms.ts
@@ -5,7 +5,7 @@
import { i18n } from '@/i18n.js';
-export function hms(ms: number, options: {
+export function hms(ms: number, options?: {
textFormat?: 'colon' | 'locale';
enableSeconds?: boolean;
enableMs?: boolean;