aboutsummaryrefslogtreecommitdiff
path: root/src/lib/persisted_state.js
diff options
context:
space:
mode:
authorlambda <lain@soykaf.club>2019-03-15 13:03:19 +0000
committerlambda <lain@soykaf.club>2019-03-15 13:03:19 +0000
commitc626f84336b08caefe72c9b74957a6c9e146d1f4 (patch)
tree581099450960b2fc80e39263e4a12b445da66e55 /src/lib/persisted_state.js
parentebc6a75d30bd96134c06f2ba5789ba86f03797c5 (diff)
parent5318227c378a9cd44baa4cc12dbb1935826c843b (diff)
Merge branch 'afterstore-refactor' into 'develop'
afterStoreSetup: Move log in and theme load to afterStoreSetup. See merge request pleroma/pleroma-fe!680
Diffstat (limited to 'src/lib/persisted_state.js')
-rw-r--r--src/lib/persisted_state.js12
1 files changed, 0 insertions, 12 deletions
diff --git a/src/lib/persisted_state.js b/src/lib/persisted_state.js
index e828a74b..7ab89c12 100644
--- a/src/lib/persisted_state.js
+++ b/src/lib/persisted_state.js
@@ -60,18 +60,6 @@ export default function createPersistedState ({
merge({}, store.state, savedState)
)
}
- if (store.state.config.customTheme) {
- // This is a hack to deal with async loading of config.json and themes
- // See: style_setter.js, setPreset()
- window.themeLoaded = true
- store.dispatch('setOption', {
- name: 'customTheme',
- value: store.state.config.customTheme
- })
- }
- if (store.state.oauth.token) {
- store.dispatch('loginUser', store.state.oauth.token)
- }
loaded = true
} catch (e) {
console.log("Couldn't load state")