MediaWiki:Citizen.js: Difference between revisions

← Older edit Newer edit →

@@ Line 32: / Line 32: @@
 }
-function scrollToTargetId(id) {
+function prepareAndScrollToTarget(id) {
    const target = document.getElementById(id);
    if (!target) return;
-   expandSectionIfCollapsed(target); // Always expand parent first
+   expandSectionIfCollapsed(target);
-  // After expanding, scroll to the real target
    setTimeout(() => {
      target.scrollIntoView({ behavior: 'smooth', block: 'start' });
@@ Line 44: / Line 43: @@
 }
-// Expand if hash exists on page load
+// === Handle TOC (Contents) clicks BEFORE hash changes ===
-mw.hook('wikipage.content').add(function() {
+document.addEventListener('click', function(e) {
-   if (window.innerWidth >= 768) {
+   if (window.innerWidth < 768) return; // Desktop only
-    const hash = window.location.hash;
-    if (hash && hash.length > 1) {
+  const anchor = e.target.closest('a[href^="#"]');
-      scrollToTargetId(hash.substring(1));
+  if (!anchor) return;
-    }
-   }
+  const href = anchor.getAttribute('href');
+  if (!href || !href.startsWith('#')) return;
+  const id = href.substring(1);
+  if (!id) return;
+  // Prevent default jump
+  e.preventDefault();
+  // Expand and scroll manually
+  prepareAndScrollToTarget(id);
+   // Update URL manually
+  history.pushState(null, '', href);
 });
-// Expand and scroll when clicking Contents (TOC)
+// === Handle page load with #hash ===
-window.addEventListener('hashchange', function() {
+mw.hook('wikipage.content').add(function() {
    if (window.innerWidth >= 768) {
      const hash = window.location.hash;
      if (hash && hash.length > 1) {
-       scrollToTargetId(hash.substring(1));
+       prepareAndScrollToTarget(hash.substring(1));
      }
    }
 });