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

make theme loading work with source-only presets

Browse source
This commit is contained in:
Shpuld Shpuldson 2020-02-22 10:57:08 +02:00
parent 1fb91b1795
commit 5b7acca0ba
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/modules/instance.js
View file

@ -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
applyTheme(themeData.theme)
// 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)
}
}) })
}, },
fetchEmoji ({ dispatch, state }) { fetchEmoji ({ dispatch, state }) {