From 199a9d1c057af097f0dcb696d153612977977c4d Mon Sep 17 00:00:00 2001 From: ppoffice Date: Sun, 11 Sep 2022 22:45:41 -0400 Subject: [PATCH] fix(view): jump to correct hash element with animation.js --- source/js/animation.js | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/source/js/animation.js b/source/js/animation.js index 50c7c3fc2..cff926c8c 100644 --- a/source/js/animation.js +++ b/source/js/animation.js @@ -1,4 +1,4 @@ -(function() { +(function () { function $() { return Array.prototype.slice.call(document.querySelectorAll.apply(document, arguments)); } @@ -11,7 +11,7 @@ [ '.column-main > .card, .column-main > .pagination, .column-main > .post-navigation', '.column-left > .card, .column-right-shadow > .card', - '.column-right > .card' + '.column-right > .card', ].forEach(selector => { $(selector).forEach(element => { element.style.transition = '0s'; @@ -20,18 +20,25 @@ element.style.transformOrigin = 'center top'; }); }); + // disable jump to location.hash + if (window.location.hash) { + window.scrollTo(0, 0); + setTimeout(() => window.scrollTo(0, 0)); + } + setTimeout(() => { $('body > .navbar, body > .section, body > .footer').forEach(element => { element.style.opacity = '1'; element.style.transition = 'opacity 0.3s ease-out, transform 0.3s ease-out'; }); document.querySelector('body > .navbar').style.transform = 'translateY(0)'; + + let i = 1; [ '.column-main > .card, .column-main > .pagination, .column-main > .post-navigation', '.column-left > .card, .column-right-shadow > .card', - '.column-right > .card' + '.column-right > .card', ].forEach(selector => { - let i = 1; $(selector).forEach(element => { setTimeout(() => { element.style.opacity = '1'; @@ -41,5 +48,12 @@ i++; }); }); + + // jump to location.hash + if (window.location.hash) { + setTimeout(() => { + document.querySelector(window.location.hash).scrollIntoView({ behavior: 'smooth' }); + }, i * 100); + } }); -}()); +})();