troldspejlet/forgejo
troldspejlet/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-24 03:21:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix markdown anchor re-clicking (#21931)

Browse source 
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 <xiaolunwen@gmail.com>
Co-authored-by: zeripath <art27@cantab.net>
This commit is contained in:
silverwind 2022-11-26 12:15:44 +01:00 committed by GitHub
parent d7f12af805
commit 5f38acd9a0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
web_src/js/markup/anchors.js
View file

@ -2,10 +2,11 @@ import {svg} from '../svg.js';
const headingSelector = '.markup h1, .markup h2, .markup h3, .markup h4, .markup h5, .markup h6'; const headingSelector = '.markup h1, .markup h2, .markup h3, .markup h4, .markup h5, .markup h6';
function scrollToAnchor() { function scrollToAnchor(hash, initial) {
if (document.querySelector(':target')) return; // abort if the browser has already scrolled to another anchor during page load
if (!window.location.hash || window.location.hash.length <= 1) return; if (initial && document.querySelector(':target')) return;
const id = decodeURIComponent(window.location.hash.substring(1)); if (hash?.length <= 1) return;
const id = decodeURIComponent(hash.substring(1));
const el = document.getElementById(`user-content-${id}`); const el = document.getElementById(`user-content-${id}`);
if (el) { if (el) {
el.scrollIntoView(); el.scrollIntoView();
@ -24,9 +25,11 @@ export function initMarkupAnchors() {
a.classList.add('anchor'); a.classList.add('anchor');
a.setAttribute('href', `#${encodeURIComponent(originalId)}`); a.setAttribute('href', `#${encodeURIComponent(originalId)}`);
a.innerHTML = svg('octicon-link'); a.innerHTML = svg('octicon-link');
a.addEventListener('click', (e) => {
scrollToAnchor(e.currentTarget.getAttribute('href'), false);
});
heading.prepend(a); heading.prepend(a);
} }
scrollToAnchor(); scrollToAnchor(window.location.hash, true);
window.addEventListener('hashchange', scrollToAnchor);
} }