]> cat aescling's git repositories - mastodon.git/commitdiff
Throw layout, isWide, navbarUnder back into mapStateToProps.
authorDavid Yip <yipdw@member.fsf.org>
Fri, 17 Nov 2017 06:11:01 +0000 (00:11 -0600)
committerDavid Yip <yipdw@member.fsf.org>
Fri, 17 Nov 2017 06:11:01 +0000 (00:11 -0600)
This gets wide view, auto layout, and navbar-under-mobile working again.

app/javascript/mastodon/features/ui/index.js

index fc51df163c44162c067590fc5434026f16ca4596..345492577a044b1f98e9965d8cfa5e2ec07e549c 100644 (file)
@@ -54,6 +54,9 @@ const messages = defineMessages({
 const mapStateToProps = state => ({
   isComposing: state.getIn(['compose', 'is_composing']),
   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 = {