about summary refs log tree commit diff
diff options
context:
space:
mode:
authorHanage999 <hanage999@crazynewworld.net>2019-05-26 19:22:33 +0900
committerThibG <thib@sitedethib.com>2019-06-13 22:15:31 +0200
commitc095eed121b672794d9bd31409c2659b1f2b128b (patch)
treeb1f143e962b2077519fb0de2f9ff9d0115ceb891
parentff88387a4afff249c14511780c59e485a49631b8 (diff)
[Glitch] Fix wrong redirect from getting started to home in advanced Web UI
Port 4a818ac2deffaff9925ce5b160dbc5385b815a87 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
-rw-r--r--app/javascript/flavours/glitch/features/getting_started/index.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/javascript/flavours/glitch/features/getting_started/index.js b/app/javascript/flavours/glitch/features/getting_started/index.js
index b07789562..0b04120a8 100644
--- a/app/javascript/flavours/glitch/features/getting_started/index.js
+++ b/app/javascript/flavours/glitch/features/getting_started/index.js
@@ -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;
     }