Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Fix pop-out player appearing on mobile screens in web UI (#15157)

Browse source 
Fix #15092
This commit is contained in:
Eugen Rochko 2020-11-16 05:16:39 +01:00 • committed by GitHub
parent 04a079e723
commit 18ca4e0e9a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 79 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/javascript/mastodon/reducers/meta.js
View file

@ -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;
}