From cddceb9dcacc769ffe21470fee928641ba92ec79 Mon Sep 17 00:00:00 2001 From: silverwind Date: Sat, 26 Nov 2022 17:21:13 +0100 Subject: [PATCH] Fix markdown anchor re-clicking (#21931) (#21946) Backport #21931. The hashchange event did not fire on re-click of a active anchor. Instead, use the click event which always fires. Fixes: https://github.com/go-gitea/gitea/issues/21680 Co-authored-by: Lunny Xiao Co-authored-by: zeripath --- web_src/js/markup/anchors.js | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/web_src/js/markup/anchors.js b/web_src/js/markup/anchors.js index cc2ed5db78..53dfa2980c 100644 --- a/web_src/js/markup/anchors.js +++ b/web_src/js/markup/anchors.js @@ -2,10 +2,11 @@ import {svg} from '../svg.js'; const headingSelector = '.markup h1, .markup h2, .markup h3, .markup h4, .markup h5, .markup h6'; -function scrollToAnchor() { - if (document.querySelector(':target')) return; - if (!window.location.hash || window.location.hash.length <= 1) return; - const id = decodeURIComponent(window.location.hash.substring(1)); +function scrollToAnchor(hash, initial) { + // abort if the browser has already scrolled to another anchor during page load + if (initial && document.querySelector(':target')) return; + if (hash?.length <= 1) return; + const id = decodeURIComponent(hash.substring(1)); const el = document.getElementById(`user-content-${id}`); if (el) { el.scrollIntoView(); @@ -24,9 +25,11 @@ export function initMarkupAnchors() { a.classList.add('anchor'); a.setAttribute('href', `#${encodeURIComponent(originalId)}`); a.innerHTML = svg('octicon-link'); + a.addEventListener('click', (e) => { + scrollToAnchor(e.currentTarget.getAttribute('href'), false); + }); heading.prepend(a); } - scrollToAnchor(); - window.addEventListener('hashchange', scrollToAnchor); + scrollToAnchor(window.location.hash, true); }