From 54064d7a304e80c29c4a4fcee733f2ad66c45ecc Mon Sep 17 00:00:00 2001 From: Andrew Brehaut Date: Thu, 11 Mar 2021 08:16:51 +1300 Subject: [PATCH 1/2] #2371 Checks footnote target before overriding browser default behavior --- Shared/Article Rendering/newsfoot.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Shared/Article Rendering/newsfoot.js b/Shared/Article Rendering/newsfoot.js index 296c74d0b..fc5b386d5 100644 --- a/Shared/Article Rendering/newsfoot.js +++ b/Shared/Article Rendering/newsfoot.js @@ -140,12 +140,17 @@ if (targetId) break; } if (targetId === undefined) return; - + + // Only override the default behaviour when we know we can find the + // target element + const targetElement = document.querySelector(`[id='${targetId}']`); + if (targetElement === null) return; + ev.preventDefault(); installContainer(ev.target); - const content = document.querySelector(`[id='${targetId}']`).innerHTML; - void new Footnote(content, ev.target); + + void new Footnote(targetElement.innerHTML, ev.target); }); // Handle clicks on the footnote reverse link From b9ea58dc4fc6f14626eb0d3d8839d7501841bd95 Mon Sep 17 00:00:00 2001 From: Andrew Brehaut Date: Thu, 11 Mar 2021 10:54:25 +1300 Subject: [PATCH 2/2] Update Shared/Article Rendering/newsfoot.js Good catch thanks Co-authored-by: Jed Fox --- Shared/Article Rendering/newsfoot.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Shared/Article Rendering/newsfoot.js b/Shared/Article Rendering/newsfoot.js index fc5b386d5..1a53dbe42 100644 --- a/Shared/Article Rendering/newsfoot.js +++ b/Shared/Article Rendering/newsfoot.js @@ -143,7 +143,7 @@ // Only override the default behaviour when we know we can find the // target element - const targetElement = document.querySelector(`[id='${targetId}']`); + const targetElement = document.getElementById(targetId); if (targetElement === null) return; ev.preventDefault();