diff options
author | Hanage999 <hanage999@crazynewworld.net> | 2019-05-26 19:22:33 +0900 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2019-05-26 12:22:33 +0200 |
commit | 4a818ac2deffaff9925ce5b160dbc5385b815a87 (patch) | |
tree | 31b1b104380eeaa8e72104986de090b9afaa6583 /app/javascript | |
parent | 0e445ebb1392c8dbce320509d219f16c7c221406 (diff) |
Fix wrong redirect from getting started to home in advanced Web UI (#10839)
* update Ruby to 2.5.3 * Link to Getting Started will not redirect to Home in multi-column UI (https://github.com/tootsuite/mastodon/pull/10835)
Diffstat (limited to 'app/javascript')
-rw-r--r-- | app/javascript/mastodon/features/getting_started/index.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/javascript/mastodon/features/getting_started/index.js b/app/javascript/mastodon/features/getting_started/index.js index bafcc275b..129ce77f6 100644 --- a/app/javascript/mastodon/features/getting_started/index.js +++ b/app/javascript/mastodon/features/getting_started/index.js @@ -76,9 +76,9 @@ class GettingStarted extends ImmutablePureComponent { }; componentDidMount () { - const { myAccount, fetchFollowRequests } = this.props; + const { myAccount, fetchFollowRequests, multiColumn } = this.props; - if (window.innerWidth >= NAVIGATION_PANEL_BREAKPOINT) { + if (!multiColumn && window.innerWidth >= NAVIGATION_PANEL_BREAKPOINT) { this.context.router.history.replace('/timelines/home'); return; } |