From 3c47521f0e356ec1a6283516785aaf1b10c3ada5 Mon Sep 17 00:00:00 2001
From: Jure Grabnar <jgrabnar@biosistemika.com>
Date: Wed, 10 Apr 2019 15:46:30 +0200
Subject: [PATCH 1/2] Reset scrollbar after selecting date filter

Closes SCI-3302
---
 app/assets/javascripts/global_activities/side_pane.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/assets/javascripts/global_activities/side_pane.js b/app/assets/javascripts/global_activities/side_pane.js
index 90353e745..9e999ae48 100644
--- a/app/assets/javascripts/global_activities/side_pane.js
+++ b/app/assets/javascripts/global_activities/side_pane.js
@@ -270,6 +270,7 @@ $(function() {
       GlobalActivitiesUpdateTopPaneTags();
       reloadActivities();
       resetHotButtonsBackgroundColor();
+      $('.ga-main').scrollTop(0);
     }
   });
 
@@ -281,6 +282,7 @@ $(function() {
       GlobalActivitiesUpdateTopPaneTags();
       reloadActivities();
       resetHotButtonsBackgroundColor();
+      $('.ga-main').scrollTop(0);
     }
   });
 
@@ -332,6 +334,7 @@ $(function() {
     reloadActivities();
 
     resetHotButtonsBackgroundColor();
+    $('.ga-main').scrollTop(0);
     $(this).addClass('selected');
   });
 });

From 84209747793441806eaf71f1a24731fd7b4f6f81 Mon Sep 17 00:00:00 2001
From: Jure Grabnar <jgrabnar@biosistemika.com>
Date: Wed, 10 Apr 2019 18:45:12 +0200
Subject: [PATCH 2/2] Move scrollTop to reloadActivities

Closes SCI-3302
---
 app/assets/javascripts/global_activities/side_pane.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/global_activities/side_pane.js b/app/assets/javascripts/global_activities/side_pane.js
index 9e999ae48..c90084481 100644
--- a/app/assets/javascripts/global_activities/side_pane.js
+++ b/app/assets/javascripts/global_activities/side_pane.js
@@ -201,6 +201,8 @@ $(function() {
         }
         updateRunning = false;
         animateSpinner(null, false);
+
+        $('.ga-main').scrollTop(0);
         PerfectSb().update_all();
       },
       error: function() {
@@ -270,7 +272,6 @@ $(function() {
       GlobalActivitiesUpdateTopPaneTags();
       reloadActivities();
       resetHotButtonsBackgroundColor();
-      $('.ga-main').scrollTop(0);
     }
   });
 
@@ -282,7 +283,6 @@ $(function() {
       GlobalActivitiesUpdateTopPaneTags();
       reloadActivities();
       resetHotButtonsBackgroundColor();
-      $('.ga-main').scrollTop(0);
     }
   });
 
@@ -334,7 +334,6 @@ $(function() {
     reloadActivities();
 
     resetHotButtonsBackgroundColor();
-    $('.ga-main').scrollTop(0);
     $(this).addClass('selected');
   });
 });