Skip to content

Commit

Permalink
Fix markdown anchor re-clicking (#21931) (#21946)
Browse files Browse the repository at this point in the history
Backport #21931. The hashchange event did not fire on re-click of a
active anchor. Instead, use the click event which always fires.

Fixes: #21680

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: zeripath <art27@cantab.net>
  • Loading branch information
3 people committed Nov 26, 2022
1 parent b56d269 commit cddceb9
Showing 1 changed file with 9 additions and 6 deletions.
15 changes: 9 additions & 6 deletions web_src/js/markup/anchors.js
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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);
}

0 comments on commit cddceb9

Please sign in to comment.