ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Throw layout, isWide, navbarUnder back into mapStateToProps. 

This gets wide view, auto layout, and navbar-under-mobile working again.
rebase/4.0.0rc2
David Yip 2017-11-17 00:11:01 -06:00
parent b28b405b97
commit 392945f9a3
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/javascript/mastodon/features/ui/index.js
View File

@ -54,6 +54,9 @@ const messages = defineMessages({
const mapStateToProps = state => ({ const mapStateToProps = state => ({
isComposing: state.getIn(['compose', 'is_composing']), isComposing: state.getIn(['compose', 'is_composing']),
hasComposingText: state.getIn(['compose', 'text']) !== '', hasComposingText: state.getIn(['compose', 'text']) !== '',
layout: state.getIn(['local_settings', 'layout']),
isWide: state.getIn(['local_settings', 'stretch']),
navbarUnder: state.getIn(['local_settings', 'navbar_under'])
}); });
const keyMap = { const keyMap = {