diff options
| author | syuilo <4439005+syuilo@users.noreply.github.com> | 2025-03-12 14:34:10 +0900 |
|---|---|---|
| committer | syuilo <4439005+syuilo@users.noreply.github.com> | 2025-03-12 14:34:10 +0900 |
| commit | f8e244f48d8382b9024a384f29605326ee4abef3 (patch) | |
| tree | c9e486bb53d28a6cf48e1dfa0b34406e490f5735 /packages/frontend/src/components/MkPreferenceContainer.vue | |
| parent | Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop (diff) | |
| download | sharkey-f8e244f48d8382b9024a384f29605326ee4abef3.tar.gz sharkey-f8e244f48d8382b9024a384f29605326ee4abef3.tar.bz2 sharkey-f8e244f48d8382b9024a384f29605326ee4abef3.zip | |
enhance(frontend): アカウントオーバーライド設定とデバイス間同期の併用に対応
Diffstat (limited to 'packages/frontend/src/components/MkPreferenceContainer.vue')
| -rw-r--r-- | packages/frontend/src/components/MkPreferenceContainer.vue | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/packages/frontend/src/components/MkPreferenceContainer.vue b/packages/frontend/src/components/MkPreferenceContainer.vue index 40a9a4dca7..acdd2a8d3b 100644 --- a/packages/frontend/src/components/MkPreferenceContainer.vue +++ b/packages/frontend/src/components/MkPreferenceContainer.vue @@ -4,7 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only --> <template> -<div :class="$style.root"> +<div :class="$style.root" @contextmenu.prevent.stop="showMenu($event, true)"> <div :class="$style.body"> <slot></slot> </div> @@ -12,7 +12,7 @@ SPDX-License-Identifier: AGPL-3.0-only <i v-if="isSyncEnabled" class="ti ti-cloud-cog" style="color: var(--MI_THEME-accent); opacity: 0.7;"></i> <i v-if="isAccountOverrided" class="ti ti-user-cog" style="color: var(--MI_THEME-accent); opacity: 0.7;"></i> <div :class="$style.buttons"> - <button class="_button" style="color: var(--MI_THEME-fg)" @click="showMenu"><i class="ti ti-dots"></i></button> + <button class="_button" style="color: var(--MI_THEME-fg)" @click="showMenu($event)"><i class="ti ti-dots"></i></button> </div> </div> </div> @@ -32,16 +32,22 @@ const props = withDefaults(defineProps<{ const isAccountOverrided = ref(prefer.isAccountOverrided(props.k)); const isSyncEnabled = ref(prefer.isSyncEnabled(props.k)); -function showMenu(ev: MouseEvent) { +function showMenu(ev: MouseEvent, contextmenu?: boolean) { const i = window.setInterval(() => { isAccountOverrided.value = prefer.isAccountOverrided(props.k); isSyncEnabled.value = prefer.isSyncEnabled(props.k); }, 100); - os.popupMenu(prefer.getPerPrefMenu(props.k), ev.currentTarget ?? ev.target, { - onClosing: () => { + if (contextmenu) { + os.contextMenu(prefer.getPerPrefMenu(props.k), ev).then(() => { window.clearInterval(i); - }, - }); + }); + } else { + os.popupMenu(prefer.getPerPrefMenu(props.k), ev.currentTarget ?? ev.target, { + onClosing: () => { + window.clearInterval(i); + }, + }); + } } </script> |