fixes
This commit is contained in:
parent
4e235562aa
commit
6cdb921e56
2 changed files with 4 additions and 4 deletions
|
|
@ -37,7 +37,7 @@ const FilteringTab = {
|
|||
label: this.$t(`user_card.mute_block_${mode}`),
|
||||
})),
|
||||
muteFiltersDraftObject: cloneDeep(
|
||||
useMergedConfigStore().mergedConfig.muteFilters,
|
||||
useSyncConfigStore().prefsStorage.simple.muteFilters,
|
||||
),
|
||||
muteFiltersDraftDirty: Object.fromEntries(
|
||||
Object.entries(
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ export const useMergedConfigStore = defineStore('merged_config', {
|
|||
const getDefault = (k) => instancePrefs[k] ?? ROOT_CONFIG[k]
|
||||
|
||||
const result = Object.fromEntries(
|
||||
Object.keys(INSTANCE_DEFAULT_CONFIG).map((k) => [
|
||||
Object.keys(ROOT_CONFIG).map((k) => [
|
||||
k,
|
||||
getValue(k) ?? getDefault(k),
|
||||
]),
|
||||
|
|
@ -41,7 +41,7 @@ export const useMergedConfigStore = defineStore('merged_config', {
|
|||
const getDefault = (k) => instancePrefs[k] ?? ROOT_CONFIG[k]
|
||||
|
||||
const result = Object.fromEntries(
|
||||
Object.keys(INSTANCE_DEFAULT_CONFIG).map((k) => [
|
||||
Object.keys(ROOT_CONFIG).map((k) => [
|
||||
k,
|
||||
getDefault(k),
|
||||
]),
|
||||
|
|
@ -58,7 +58,7 @@ export const useMergedConfigStore = defineStore('merged_config', {
|
|||
tempPrefs[k] ?? localPrefs[k] ?? syncPrefs.simple[k] ?? instancePrefs[k]
|
||||
|
||||
const result = Object.fromEntries(
|
||||
Object.keys(INSTANCE_DEFAULT_CONFIG).map(([k, value]) => [
|
||||
Object.keys(ROOT_CONFIG).map(([k, value]) => [
|
||||
k,
|
||||
getValue(k),
|
||||
]),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue