Skip to content

Commit 51f63cf

Browse files
Hanage999hiyuki2578
authored andcommitted
Fix wrong redirect from getting started to home in advanced Web UI (mastodon#10839)
* update Ruby to 2.5.3 * Link to Getting Started will not redirect to Home in multi-column UI (mastodon#10835)
1 parent edd95ea commit 51f63cf

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

  • app/javascript/mastodon/features/getting_started

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,12 @@ class GettingStarted extends ImmutablePureComponent {
7676
};
7777

7878
componentDidMount () {
79-
const { myAccount, fetchFollowRequests } = this.props;
79+
const { myAccount, fetchFollowRequests, multiColumn } = this.props;
8080

81-
//if (window.innerWidth >= NAVIGATION_PANEL_BREAKPOINT) {
82-
//this.context.router.history.replace('/timelines/home');
83-
//return;
84-
//}
81+
if (!multiColumn && window.innerWidth >= NAVIGATION_PANEL_BREAKPOINT) {
82+
this.context.router.history.replace('/timelines/home');
83+
return;
84+
}
8585

8686
if (myAccount.get('locked')) {
8787
fetchFollowRequests();

0 commit comments

Comments
 (0)