mirrors/misskey
1
0
Fork 1
mirror of https://github.com/misskey-dev/misskey.git synced 2026-05-23 11:04:10 +02:00
Code Releases Activity

enhance(frontend): 設定の同期をオンにするときに競合したときに値をマージできるように

Browse Source
This commit is contained in:
syuilo
2025-05-31 12:49:10 +09:00
parent 9f196bbf75
commit 0254570fbf
8 changed files with 85 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/frontend/src/pages/settings/navbar.vue
View File

@@ -69,6 +69,7 @@ import { i18n } from '@/i18n.js';
import { definePage } from '@/page.js';
import { prefer } from '@/preferences.js';
import { PREF_DEF } from '@/preferences/def.js';
import { getInitialPrefValue } from '@/preferences/manager.js';
const Sortable = defineAsyncComponent(() => import('vuedraggable').then(x => x.default));
@@ -106,7 +107,7 @@ async function save() {
}
function reset() {
items.value = PREF_DEF.menu.default.map(x => ({
items.value = getInitialPrefValue('menu').map(x => ({
id: Math.random().toString(),
type: x,
}));

3
packages/frontend/src/pages/settings/sounds.vue
View File

@@ -75,6 +75,7 @@ import MkSwitch from '@/components/MkSwitch.vue';
import MkPreferenceContainer from '@/components/MkPreferenceContainer.vue';
import { PREF_DEF } from '@/preferences/def.js';
import MkFeatureBanner from '@/components/MkFeatureBanner.vue';
import { getInitialPrefValue } from '@/preferences/manager.js';
const notUseSound = prefer.model('sound.notUseSound');
const useSoundOnlyWhenActive = prefer.model('sound.useSoundOnlyWhenActive');
@@ -113,7 +114,7 @@ async function updated(type: keyof typeof sounds.value, sound) {
function reset() {
for (const sound of Object.keys(sounds.value) as Array<keyof typeof sounds.value>) {
const v = PREF_DEF[`sound.on.${sound}`].default;
const v = getInitialPrefValue(`sound.on.${sound}`);
prefer.commit(`sound.on.${sound}`, v);
sounds.value[sound] = v;
}