hj/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

work on local-only settings

Browse source
This commit is contained in:
Henry Jameson 2026-02-27 15:49:44 +02:00
commit 449c244d11
6 changed files with 35 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/stores/interface.js
View file

@ -66,7 +66,7 @@ export const useInterfaceStore = defineStore('interface', {
this.temporaryChangesConfirm = confirm
this.temporaryChangesRevert = revert
const countdownFunc = () => {
if (this.temporaryChangesCountdown === 1) {
if (this.temporaryChangesCountdown <= 1) {
this.temporaryChangesRevert()
this.clearTemporaryChanges()
} else {

12
src/stores/local_config.js
View file

@ -39,18 +39,6 @@ export const useLocalConfigStore = defineStore('local_config', {
})
},
},
getters: {
mergedConfig: (state) => {
const instancePrefs = useInstanceStore().prefsStorage
const result = Object.fromEntries(
Object.entries(state.prefsStorage).map(([k, v]) => [
k,
state.tempStorage[k] ?? v ?? instancePrefs[k],
]),
)
return result
},
},
persist: {
afterLoad(state) {
return {

3
src/stores/sync_config.js
View file

@ -691,10 +691,11 @@ export const useSyncConfigStore = defineStore('sync_config', {
mergedConfig: (state) => {
const instancePrefs = useInstanceStore().prefsStorage
const localPrefs = useLocalConfigStore().prefsStorage
const tempPrefs = useLocalConfigStore().tempStorage
const result = Object.fromEntries(
Object.entries(state.prefsStorage.simple).map(([k, v]) => [
k,
localPrefs[k] ?? v ?? instancePrefs[k],
tempPrefs[k] ?? localPrefs[k] ?? v ?? instancePrefs[k],
]),
)
return result