improve scroll

ain-soph · Oct 19, 2021 · 1eb2be5 · 1eb2be5
1 parent 9a60cf7
commit 1eb2be5
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 18 deletions.
diff --git a/js/side-menus.js b/js/side-menus.js
@@ -61,7 +61,7 @@ window.sideMenus = {
               next.style.display = 'block';
               link.attr('aria-expanded', 'true')
             }
-            ev.stopPropagation()
+            ev.stopPropagation();
             return false;
           });
           link.prepend(expand);
@@ -89,11 +89,6 @@ window.sideMenus = {
         sideMenus.expandClosestUnexpandedParentList(linkWithHash);
       }
 
-      // Bind click events on right menu links
-      $('#sphinx-template-right-menu').on('click', 'a.reference.internal', function() {
-        $(this).children("button").trigger("click");
-      });
-
       sideMenus.handleNavBar();
       sideMenus.handleLeftMenu();
       if (sideMenus.rightMenuIsOnScreen()) {

diff --git a/js/theme.js b/js/theme.js
@@ -339,14 +339,17 @@ $(".stars-outer > i").on("click", function() {
 })
 
 $("#sphinx-template-side-scroll-right").on("click", "a.reference.internal", function (e) {
-  var href = $(this).attr("href").replaceAll('.', '\\.');
+  var link = $(this)
+  var href = link.attr("href").replaceAll('.', '\\.');
   var offset = 0
   if (href !== "#"){
     offset = $(href).offset().top - utilities.getFixedOffset()
   }
-  $('html, body').stop().animate({scrollTop: offset}, 850);
+  $('html').stop().animate({scrollTop: offset}, 850, function (){
+    link.children("button").trigger("click");
+  });
   e.preventDefault();
-  // e.stopPropagation();
+  e.stopPropagation();
 });
 
 topMenu = $("#sphinx-template-side-scroll-right"),

diff --git a/trojanzoo_sphinx_theme/static/js/theme.js b/trojanzoo_sphinx_theme/static/js/theme.js
@@ -477,7 +477,7 @@ window.sideMenus = {
               next.style.display = 'block';
               link.attr('aria-expanded', 'true')
             }
-            ev.stopPropagation()
+            ev.stopPropagation();
             return false;
           });
           link.prepend(expand);
@@ -505,11 +505,6 @@ window.sideMenus = {
         sideMenus.expandClosestUnexpandedParentList(linkWithHash);
       }
 
-      // Bind click events on right menu links
-      $('#sphinx-template-right-menu').on('click', 'a.reference.internal', function() {
-        $(this).children("button").trigger("click");
-      });
-
       sideMenus.handleNavBar();
       sideMenus.handleLeftMenu();
       if (sideMenus.rightMenuIsOnScreen()) {
@@ -978,14 +973,17 @@ $(".stars-outer > i").on("click", function() {
 })
 
 $("#sphinx-template-side-scroll-right").on("click", "a.reference.internal", function (e) {
-  var href = $(this).attr("href").replaceAll('.', '\\.');
+  var link = $(this)
+  var href = link.attr("href").replaceAll('.', '\\.');
   var offset = 0
   if (href !== "#"){
     offset = $(href).offset().top - utilities.getFixedOffset()
   }
-  $('html, body').stop().animate({scrollTop: offset}, 850);
+  $('html').stop().animate({scrollTop: offset}, 850, function (){
+    link.children("button").trigger("click");
+  });
   e.preventDefault();
-  // e.stopPropagation();
+  e.stopPropagation();
 });
 
 topMenu = $("#sphinx-template-side-scroll-right"),