From 90e962ccbf50b171e7d5a3ba1385dded4006b842 Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Tue, 6 Sep 2022 11:12:03 +0200
Subject: [PATCH] Remove scroll before page leave [SCI-7169]

---
 app/assets/javascripts/sitewide/infinite_scroll.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/sitewide/infinite_scroll.js b/app/assets/javascripts/sitewide/infinite_scroll.js
index 6db3e03f6..82c11b58c 100644
--- a/app/assets/javascripts/sitewide/infinite_scroll.js
+++ b/app/assets/javascripts/sitewide/infinite_scroll.js
@@ -26,7 +26,7 @@ var InfiniteScroll = (function() {
         $container.data('next-page', result.next_page);
       } else {
         $container.addClass('last-page');
-        if ($container.data('config').endOfListTemplate && page > 2) {
+        if ($container.data('config').endOfListTemplate && page >= 2) {
           $($($container.data('config').endOfListTemplate).html()).appendTo($container);
         }
       }
@@ -60,6 +60,10 @@ var InfiniteScroll = (function() {
     if (scrollNotVisible($container)) {
       loadData($container, $container.data('next-page'));
     }
+
+    $(document).one('turbolinks:before-visit', $container.data('config').eventTarget, function() {
+      removeScroll($container);
+    });
   }
 
   // support functions