Merge branch 'fix/profile-not-loading-without-persisted-state' into 'develop'

Fix #324 Profiles sometimes not loading when there's no persisted state

Closes #324

See merge request pleroma/pleroma-fe!553
This commit is contained in:
Shpuld Shpludson 2019-02-11 13:34:03 +00:00
commit b6bac4d06d
4 changed files with 9 additions and 5 deletions

View File

@ -55,7 +55,6 @@ const afterStoreSetup = ({ store, i18n }) => {
} }
copyInstanceOption('nsfwCensorImage') copyInstanceOption('nsfwCensorImage')
copyInstanceOption('theme')
copyInstanceOption('background') copyInstanceOption('background')
copyInstanceOption('hidePostStats') copyInstanceOption('hidePostStats')
copyInstanceOption('hideUserStats') copyInstanceOption('hideUserStats')
@ -96,6 +95,9 @@ const afterStoreSetup = ({ store, i18n }) => {
store.dispatch('initializeSocket') store.dispatch('initializeSocket')
} }
return store.dispatch('setTheme', config['theme'])
})
.then(() => {
const router = new VueRouter({ const router = new VueRouter({
mode: 'history', mode: 'history',
routes: routes(store), routes: routes(store),

View File

@ -48,7 +48,7 @@ export default function createPersistedState ({
return getState(key, storage).then((savedState) => { return getState(key, storage).then((savedState) => {
return store => { return store => {
try { try {
if (typeof savedState === 'object') { if (savedState !== null && typeof savedState === 'object') {
// build user cache // build user cache
const usersState = savedState.users || {} const usersState = savedState.users || {}
usersState.usersObject = {} usersState.usersObject = {}

View File

@ -66,9 +66,11 @@ const instance = {
case 'name': case 'name':
dispatch('setPageTitle') dispatch('setPageTitle')
break break
case 'theme':
setPreset(value, commit)
} }
},
setTheme ({ commit }, themeName) {
commit('setInstanceOption', { name: 'theme', value: themeName })
return setPreset(themeName, commit)
} }
} }
} }

View File

@ -480,7 +480,7 @@ const getThemes = () => {
} }
const setPreset = (val, commit) => { const setPreset = (val, commit) => {
getThemes().then((themes) => { return getThemes().then((themes) => {
const theme = themes[val] ? themes[val] : themes['pleroma-dark'] const theme = themes[val] ? themes[val] : themes['pleroma-dark']
const isV1 = Array.isArray(theme) const isV1 = Array.isArray(theme)
const data = isV1 ? {} : theme.theme const data = isV1 ? {} : theme.theme