interface.js
This commit is contained in:
parent
71172ec93a
commit
2c673f439f
1 changed files with 4 additions and 3 deletions
|
|
@ -8,6 +8,7 @@ import {
|
||||||
import { deserialize } from '../services/theme_data/iss_deserializer.js'
|
import { deserialize } from '../services/theme_data/iss_deserializer.js'
|
||||||
|
|
||||||
import { useInstanceStore } from 'src/stores/instance.js'
|
import { useInstanceStore } from 'src/stores/instance.js'
|
||||||
|
import { useSyncConfigStore } from 'src/stores/sync_config.js'
|
||||||
|
|
||||||
import {
|
import {
|
||||||
CURRENT_VERSION,
|
CURRENT_VERSION,
|
||||||
|
|
@ -402,13 +403,13 @@ export const useInterfaceStore = defineStore('interface', {
|
||||||
styleCustomData: userStyleCustomData,
|
styleCustomData: userStyleCustomData,
|
||||||
palette: userPaletteName,
|
palette: userPaletteName,
|
||||||
paletteCustomData: userPaletteCustomData,
|
paletteCustomData: userPaletteCustomData,
|
||||||
} = window.vuex.state.config
|
} = useSyncConfigStore().mergedConfig
|
||||||
|
|
||||||
let {
|
let {
|
||||||
theme: userThemeV2Name,
|
theme: userThemeV2Name,
|
||||||
customTheme: userThemeV2Snapshot,
|
customTheme: userThemeV2Snapshot,
|
||||||
customThemeSource: userThemeV2Source,
|
customThemeSource: userThemeV2Source,
|
||||||
} = window.vuex.state.config
|
} = useSyncConfigStore().mergedConfig
|
||||||
|
|
||||||
let majorVersionUsed
|
let majorVersionUsed
|
||||||
|
|
||||||
|
|
@ -573,7 +574,7 @@ export const useInterfaceStore = defineStore('interface', {
|
||||||
},
|
},
|
||||||
async applyTheme({ recompile = false } = {}) {
|
async applyTheme({ recompile = false } = {}) {
|
||||||
const { forceThemeRecompilation, themeDebug, theme3hacks } =
|
const { forceThemeRecompilation, themeDebug, theme3hacks } =
|
||||||
window.vuex.state.config
|
useSyncConfigStore().mergedConfig
|
||||||
this.themeChangeInProgress = true
|
this.themeChangeInProgress = true
|
||||||
// If we're not forced to recompile try using
|
// If we're not forced to recompile try using
|
||||||
// cache (tryLoadCache return true if load successful)
|
// cache (tryLoadCache return true if load successful)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue