Merge pull request #463 from ndw/iss-451

Try a little harder to scroll the ptoc into view
docbook · Jan 30, 2024 · 67414a4 · 67414a4
2 parents b0ceb13 + faa26d5
commit 67414a4
Showing 1 changed file with 16 additions and 2 deletions.
diff --git a/src/main/web/js/persistent-toc.js b/src/main/web/js/persistent-toc.js
@@ -134,12 +134,26 @@
                                     + window.location.hash);
       }
 
-      let path = window.location.pathname.substring(1) + window.location.hash;
+      // Try path#hash
+      let path = url.substring(1) + hash;
       let target = document.querySelector("nav.toc div a[rel-path='"+path+"']");
       if (target) {
         target.scrollIntoView();
       } else {
-        console.log(`ToC scroll, no match: ${path}`);
+        // Try #hash
+        target = document.querySelector("nav.toc div a[rel-path='"+hash+"']");
+        if (target) {
+          target.scrollIntoView();
+        } else {
+          // Try path
+          target = document.querySelector("nav.toc div a[rel-path='"+url.substring(1)+"']");
+          if (target) {
+            target.scrollIntoView();
+          } else {
+            // ???
+            console.log(`ToC scroll, no match: ${path}`);
+          }
+        }
       }
 
       if (!searchListener) {