Skip to content

Commit

Permalink
Fix wrong redirect from getting started to home in advanced Web UI (m…
Browse files Browse the repository at this point in the history
…astodon#10839)

* update Ruby to 2.5.3

* Link to Getting Started will not redirect to Home in multi-column UI (mastodon#10835)
  • Loading branch information
Hanage999 authored and hiyuki2578 committed Oct 2, 2019
1 parent edd95ea commit 51f63cf
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions app/javascript/mastodon/features/getting_started/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,12 @@ class GettingStarted extends ImmutablePureComponent {
};

componentDidMount () {
const { myAccount, fetchFollowRequests } = this.props;
const { myAccount, fetchFollowRequests, multiColumn } = this.props;

//if (window.innerWidth >= NAVIGATION_PANEL_BREAKPOINT) {
//this.context.router.history.replace('/timelines/home');
//return;
//}
if (!multiColumn && window.innerWidth >= NAVIGATION_PANEL_BREAKPOINT) {
this.context.router.history.replace('/timelines/home');
return;
}

if (myAccount.get('locked')) {
fetchFollowRequests();
Expand Down

0 comments on commit 51f63cf

Please sign in to comment.