make theme loading work with source-only presets
This commit is contained in:
parent
1fb91b1795
commit
5b7acca0ba
|
@ -1,5 +1,6 @@
|
||||||
import { set } from 'vue'
|
import { set } from 'vue'
|
||||||
import { getPreset, applyTheme } from '../services/style_setter/style_setter.js'
|
import { getPreset, applyTheme } from '../services/style_setter/style_setter.js'
|
||||||
|
import { CURRENT_VERSION } from '../services/theme_data/theme_data.service.js'
|
||||||
import { instanceDefaultProperties } from './config.js'
|
import { instanceDefaultProperties } from './config.js'
|
||||||
|
|
||||||
const defaultState = {
|
const defaultState = {
|
||||||
|
@ -159,7 +160,14 @@ const instance = {
|
||||||
// No need to apply theme if there's user theme already
|
// No need to apply theme if there's user theme already
|
||||||
const { customTheme } = rootState.config
|
const { customTheme } = rootState.config
|
||||||
if (customTheme) return
|
if (customTheme) return
|
||||||
|
|
||||||
|
// New theme presets don't have 'theme' property, they use 'source'
|
||||||
|
const themeSource = themeData.source
|
||||||
|
if (themeSource && themeSource.themeEngineVersion === CURRENT_VERSION) {
|
||||||
|
applyTheme(themeSource)
|
||||||
|
} else {
|
||||||
applyTheme(themeData.theme)
|
applyTheme(themeData.theme)
|
||||||
|
}
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
fetchEmoji ({ dispatch, state }) {
|
fetchEmoji ({ dispatch, state }) {
|
||||||
|
|
Loading…
Reference in New Issue