From 4f34229424f14df82e8d803ffc0b8df19da89d45 Mon Sep 17 00:00:00 2001 From: Daniel Kurowski <daniel.kurowski@grifart.cz> Date: Sat, 30 May 2020 07:37:50 +0200 Subject: [PATCH] Fixed empty hash --- src/LinkClickScrollHandler/initializeOnLinkClickScroll.ts | 4 ++++ src/LoadScrollHandler/initializeOnLoadScroll.ts | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/LinkClickScrollHandler/initializeOnLinkClickScroll.ts b/src/LinkClickScrollHandler/initializeOnLinkClickScroll.ts index d97b596..7459d5b 100644 --- a/src/LinkClickScrollHandler/initializeOnLinkClickScroll.ts +++ b/src/LinkClickScrollHandler/initializeOnLinkClickScroll.ts @@ -10,6 +10,10 @@ export function initializeOnLinkClickScroll(): void const element = event.currentTarget as HTMLAnchorElement; assert(element !== null); + if (element.hash === '' || element.hash === '#') { + return; + } + event.preventDefault(); scrollToTarget(HashTarget.fromString(element.hash, document)); }))); diff --git a/src/LoadScrollHandler/initializeOnLoadScroll.ts b/src/LoadScrollHandler/initializeOnLoadScroll.ts index fe1c332..86197f4 100644 --- a/src/LoadScrollHandler/initializeOnLoadScroll.ts +++ b/src/LoadScrollHandler/initializeOnLoadScroll.ts @@ -12,11 +12,16 @@ import {assert} from '../assert'; */ export function initializeOnLoadScroll(): void { + const hash = window.location.hash; + if (hash === '' || hash === '#') { + return; + } + let hashTarget: HashTarget|null = null; const start = performance.now(); document.addEventListener('DOMContentLoaded', () => { - hashTarget = HashTarget.fromString(window.location.hash, document); + hashTarget = HashTarget.fromString(hash, document); }); /** -- GitLab