Merge b70d729283 into 4c4f43779c

assets/js/sidebar.js

@@ -3,18 +3,6 @@ document.addEventListener("DOMContentLoaded", function () {
   enableCollapsibles();
 });
 
-function debounce(func, wait) {
-  let timeout;
-  return function executedFunction(...args) {
-    const later = () => {
-      clearTimeout(timeout);
-      func(...args);
-    };
-    clearTimeout(timeout);
-    timeout = setTimeout(later, wait);
-  };
-}
-
 function enableCollapsibles() {
   const buttons = document.querySelectorAll(".hextra-sidebar-collapsible-button");
   buttons.forEach(function (button) {
@@ -28,9 +16,10 @@ function enableCollapsibles() {
   });
 }
 
-function saveSidebarPosition(scrollPosition) {
+function saveSidebarPosition() {
-  const currentPosition = sessionStorage.getItem('sidebarScrollPosition');
+  const sidebarScrollbar = document.querySelector("aside.sidebar-container > .hextra-scrollbar");
-  if (currentPosition === null || parseInt(currentPosition) !== scrollPosition) {
+  if (sidebarScrollbar) {
+    const scrollPosition = sidebarScrollbar.scrollTop;
     sessionStorage.setItem('sidebarScrollPosition', scrollPosition);
   }
 }
@@ -47,12 +36,8 @@ function restoreSidebarPosition() {
       });
     }
 
-    const debouncedSave = debounce((position) => {
-      saveSidebarPosition(position);
-    }, 150);
-    
     sidebarScrollbar.addEventListener('scroll', function() {
-      debouncedSave(this.scrollTop);
+      saveSidebarPosition();
     });
   }
 }