diff options
| author | dave <starpumadev@gmail.com> | 2019-03-25 10:22:16 -0400 |
|---|---|---|
| committer | dave <starpumadev@gmail.com> | 2019-03-25 10:22:16 -0400 |
| commit | 4cec0d589dfc54987ec6f024b0a463d0abd847d2 (patch) | |
| tree | a88953cc409d162127edb43a702d6540c64c023e /src/lib/persisted_state.js | |
| parent | 63d7c7bd80cf8028cdefee99c1cb75614385f96b (diff) | |
| parent | 01d05316998f90451e920f8ac8d4c264a13b0cd7 (diff) | |
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-433-status-reply-form
Diffstat (limited to 'src/lib/persisted_state.js')
| -rw-r--r-- | src/lib/persisted_state.js | 12 |
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") |
