about summary refs log tree commit diff
diff options
context:
space:
mode:
authorDavid Yip <yipdw@member.fsf.org>2017-11-17 00:11:01 -0600
committerDavid Yip <yipdw@member.fsf.org>2017-11-17 00:11:01 -0600
commit392945f9a35d86b4d8d61157d7fa17c073d47156 (patch)
treebe3445b223b20d0d50f717385b3317e18c484263
parentb28b405b9763a0bb3df653b51e6d084b42e9a54d (diff)
Throw layout, isWide, navbarUnder back into mapStateToProps.
This gets wide view, auto layout, and navbar-under-mobile working again.
-rw-r--r--app/javascript/mastodon/features/ui/index.js3
1 files changed, 3 insertions, 0 deletions
diff --git a/app/javascript/mastodon/features/ui/index.js b/app/javascript/mastodon/features/ui/index.js
index fc51df163..345492577 100644
--- a/app/javascript/mastodon/features/ui/index.js
+++ b/app/javascript/mastodon/features/ui/index.js
@@ -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 = {