]> cat aescling's git repositories - mastodon.git/commitdiff
[Glitch] Fix wrong redirect from getting started to home in advanced Web UI
authorHanage999 <hanage999@crazynewworld.net>
Sun, 26 May 2019 10:22:33 +0000 (19:22 +0900)
committerThibG <thib@sitedethib.com>
Thu, 13 Jun 2019 20:15:31 +0000 (22:15 +0200)
Port 4a818ac2deffaff9925ce5b160dbc5385b815a87 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
app/javascript/flavours/glitch/features/getting_started/index.js

index b07789562c6cd4d9ec6ed5a6ccb337cc5bdf0c38..0b04120a81c78e3dbf0e452092d1fa04c2b35ba2 100644 (file)
@@ -101,9 +101,9 @@ const NAVIGATION_PANEL_BREAKPOINT = 600 + (285 * 2) + (10 * 2);
   }
 
   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;
     }