diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2017-01-09 12:37:15 +0100 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-01-09 12:37:53 +0100 |
commit | 23ebf60b95984764992c4b356048786ed0ab2953 (patch) | |
tree | bfb92ac8a271c73986b89ea8e0b00435634f2a48 /app/assets/javascripts/components/reducers/meta.jsx | |
parent | 2e71bb031b2dff90a2b0f9854bdcd804c069268a (diff) |
Improve initialState loading
Diffstat (limited to 'app/assets/javascripts/components/reducers/meta.jsx')
-rw-r--r-- | app/assets/javascripts/components/reducers/meta.jsx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/app/assets/javascripts/components/reducers/meta.jsx b/app/assets/javascripts/components/reducers/meta.jsx index c7222c60b..cd4b313d5 100644 --- a/app/assets/javascripts/components/reducers/meta.jsx +++ b/app/assets/javascripts/components/reducers/meta.jsx @@ -1,16 +1,16 @@ -import { ACCESS_TOKEN_SET } from '../actions/meta'; -import { ACCOUNT_SET_SELF } from '../actions/accounts'; +import { STORE_HYDRATE } from '../actions/store'; import Immutable from 'immutable'; -const initialState = Immutable.Map(); +const initialState = Immutable.Map({ + access_token: null, + me: null +}); export default function meta(state = initialState, action) { switch(action.type) { - case ACCESS_TOKEN_SET: - return state.set('access_token', action.token); - case ACCOUNT_SET_SELF: - return state.set('me', action.account.id); - default: - return state; + case STORE_HYDRATE: + return state.merge(action.state.get('meta')); + default: + return state; } }; |