Merge remote-tracking branch 'origin/develop' into optimize
This commit is contained in:
commit
3bf558089f
11 changed files with 39 additions and 5 deletions
|
|
@ -60,6 +60,7 @@ export const useInterfaceStore = defineStore('interface', {
|
|||
globalNotices: [],
|
||||
layoutHeight: 0,
|
||||
lastTimeline: null,
|
||||
foreignProfileBackground: null,
|
||||
}),
|
||||
actions: {
|
||||
setTemporaryChanges({ confirm, revert }) {
|
||||
|
|
@ -96,6 +97,9 @@ export const useInterfaceStore = defineStore('interface', {
|
|||
console.error(`${error}`)
|
||||
}
|
||||
},
|
||||
setForeignProfileBackground(url) {
|
||||
this.foreignProfileBackground = url
|
||||
},
|
||||
settingsSaved({ success, error }) {
|
||||
if (success) {
|
||||
if (this.noticeClearTimeout) {
|
||||
|
|
|
|||
|
|
@ -796,11 +796,12 @@ export const useSyncConfigStore = defineStore('sync_config', {
|
|||
afterLoad(state) {
|
||||
console.debug('Validating persisted state of SyncConfig')
|
||||
const newState = { ...state }
|
||||
newState.prefsStorage = newState.prefsStorage || {}
|
||||
const newEntries = Object.entries(ROOT_CONFIG).map(([path, value]) => {
|
||||
const definition = ROOT_CONFIG_DEFINITIONS[path]
|
||||
const finalValue = validateSetting({
|
||||
path,
|
||||
value: newState.prefsStorage.simple[path],
|
||||
value: newState.prefsStorage.simple?.[path],
|
||||
definition,
|
||||
throwError: false,
|
||||
validateObjects: false,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue