From 3df31bb01bf958fffce3fe3c3e306a8664b633a4 Mon Sep 17 00:00:00 2001
From: JonnyWong16 <JonnyWong16@users.noreply.github.com>
Date: Mon, 6 Nov 2017 18:09:35 -0800
Subject: [PATCH] Lock scrolling of activity card overflow

---
 .../default/current_activity_instance.html    |  2 +-
 data/interfaces/default/home_stats.html       |  2 +-
 data/interfaces/default/index.html            | 35 ++++++++++---------
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/data/interfaces/default/current_activity_instance.html b/data/interfaces/default/current_activity_instance.html
index 21f212fc..5559804f 100644
--- a/data/interfaces/default/current_activity_instance.html
+++ b/data/interfaces/default/current_activity_instance.html
@@ -125,7 +125,7 @@ DOCUMENTATION :: END
             </div>
             <div class="dashboard-activity-info-container">
                 <div class="dashboard-activity-info-scroller scrollbar-macosx">
-                    <div class="dashboard-activity-info">
+                    <div class="dashboard-activity-info scoller-content">
                         <ul class="list-unstyled dashboard-activity-info-list">
                             <li class="dashboard-activity-info-item">
                                 <div class="sub-heading">Platform</div>
diff --git a/data/interfaces/default/home_stats.html b/data/interfaces/default/home_stats.html
index d0e821ef..37e6d70e 100644
--- a/data/interfaces/default/home_stats.html
+++ b/data/interfaces/default/home_stats.html
@@ -119,7 +119,7 @@ DOCUMENTATION :: END
                     % endif
                 </div>
                 <div class="dashboard-stats-info-scroller scrollbar-macosx">
-                    <div class="dashboard-stats-info">
+                    <div class="dashboard-stats-info scoller-content">
                         <ul class="list-unstyled dashboard-stats-info-list">
                             % for row in top_stat['rows']:
                             <li class="dashboard-stats-info-item" data-stat_id="${stat_id}" data-art="${row.get('art')}" data-thumb="${row.get('thumb')}" data-platform="${row.get('platform_type')}"
diff --git a/data/interfaces/default/index.html b/data/interfaces/default/index.html
index 71eb80d4..9cbd33a7 100644
--- a/data/interfaces/default/index.html
+++ b/data/interfaces/default/index.html
@@ -215,6 +215,22 @@
             time_format = data.time_format;
         }
     });
+
+    function lockScroll(elem) {
+        $(elem).each(function (i, instance)  {
+            var childHeight = $(instance).children('.scoller-content').height();
+            var height = $(instance).height();
+            var scrollHeight = $(instance).get(0).scrollHeight;
+
+            if (childHeight > height) {
+                $(instance).on('mousewheel', function(e, d) {
+                    if(($(instance).scrollTop() >= (scrollHeight - height)) && d < 0 || ($(instance).scrollTop() <= 0) && d > 0) {
+                        e.preventDefault();
+                    }
+                });
+            }
+        });
+    };
 </script>
 % if 'current_activity' in config['home_sections']:
 <script>
@@ -492,6 +508,7 @@
                 $('#activity-instance-' + session.session_key + ' .dashboard-activity-info-scroller').scrollbar();
                 $('#activity-instance-' + session.session_key + ' [data-toggle=tooltip]').tooltip({ container: 'body', placement: 'right', delay: 50 })
                 $('#terminate-button-' + session.session_key).tooltip('destroy').tooltip({ container: 'body', placement: 'left', delay: 50 });
+                lockScroll('#activity-instance-' + session.session_key + ' .dashboard-activity-info-scroller');
             }
         });
     }
@@ -610,7 +627,7 @@
             complete: function (xhr, status) {
                 $("#home-stats").html(xhr.responseText);
                 $('#ajaxMsg').fadeOut();
-                lockScroll();
+                lockScroll('#home-stats .dashboard-stats-info-scroller');
             }
         });
     }
@@ -640,22 +657,6 @@
 
     $('#watched-stats-days').tooltip({ container: 'body', placement: 'top', html: true });
     $('#watched-stats-count').tooltip({ container: 'body', placement: 'top', html: true });
-
-    function lockScroll() {
-        $('#home-stats .dashboard-stats-info-scroller.scroll-content').each(function (i, instance)  {
-            var childHeight = $(instance).children('.dashboard-stats-info').height();
-            var height = $(instance).height();
-            var scrollHeight = $(instance).get(0).scrollHeight;
-
-            if (childHeight > height) {
-                $(instance).on('mousewheel', function(e, d) {
-                    if(($(instance).scrollTop() >= (scrollHeight - height)) && d < 0 || ($(instance).scrollTop() <= 0) && d > 0) {
-                        e.preventDefault();
-                    }
-                });
-            }
-        });
-    };
 </script>
 % endif
 % if 'library_stats' in config['home_sections']: