Merge pull request #630 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

1 files changed, 9 insertions, 0 deletions

diff --git a/app/javascript/packs/public.js b/app/javascript/packs/public.js
index 3a1ca1a7b..7d632776e 100644
--- a/app/javascript/packs/public.js
+++ b/app/javascript/packs/public.js
@@ -15,6 +15,7 @@ function main() {
   const React = require('react');
   const ReactDOM = require('react-dom');
   const Rellax = require('rellax');
+  const createHistory = require('history').createBrowserHistory;
 
   ready(() => {
     const locale = document.documentElement.lang;
@@ -70,6 +71,14 @@ function main() {
     }
 
     new Rellax('.parallax', { speed: -1 });
+
+    const history = createHistory();
+    const detailedStatuses = document.querySelectorAll('.public-layout .detailed-status');
+    const location = history.location;
+    if (detailedStatuses.length === 1 && (!location.state || !location.state.scrolledToDetailedStatus)) {
+      detailedStatuses[0].scrollIntoView();
+      history.replace(location.pathname, { ...location.state, scrolledToDetailedStatus: true });
+    }
   });
 }