diff options
author | Fire Demon <firedemon@creature.cafe> | 2020-11-24 12:27:15 -0600 |
---|---|---|
committer | Fire Demon <firedemon@creature.cafe> | 2020-11-24 12:27:15 -0600 |
commit | 69fa4f7d4f3c435018c1e7cb9e6a0fcb5b233695 (patch) | |
tree | ffbd8bc1e5c820fce33624874088863c43460299 /app/javascript/mastodon/reducers/meta.js | |
parent | 90b33ab8af91991217cdce3e2d9163756e58a691 (diff) | |
parent | 24696458bf22c8529b49f89b2791e3e07583b7e0 (diff) |
Merge remote-tracking branch 'upstream/master' into merge-glitch
Diffstat (limited to 'app/javascript/mastodon/reducers/meta.js')
-rw-r--r-- | app/javascript/mastodon/reducers/meta.js | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/app/javascript/mastodon/reducers/meta.js b/app/javascript/mastodon/reducers/meta.js index 36a5a1c35..65becc44f 100644 --- a/app/javascript/mastodon/reducers/meta.js +++ b/app/javascript/mastodon/reducers/meta.js @@ -1,15 +1,20 @@ -import { STORE_HYDRATE } from '../actions/store'; +import { STORE_HYDRATE } from 'mastodon/actions/store'; +import { APP_LAYOUT_CHANGE } from 'mastodon/actions/app'; import { Map as ImmutableMap } from 'immutable'; +import { layoutFromWindow } from 'mastodon/is_mobile'; const initialState = ImmutableMap({ streaming_api_base_url: null, access_token: null, + layout: layoutFromWindow(), }); export default function meta(state = initialState, action) { switch(action.type) { case STORE_HYDRATE: return state.merge(action.state.get('meta')); + case APP_LAYOUT_CHANGE: + return state.set('layout', action.layout); default: return state; } |