Fixed instant loading jumping back to the top

This commit is contained in:
squidfunk 2023-02-10 19:43:26 +01:00
parent 329d26d34a
commit f480bb28a9
4 changed files with 7 additions and 6 deletions

View File

@ -240,7 +240,7 @@
</script> </script>
{% endblock %} {% endblock %}
{% block scripts %} {% block scripts %}
<script src="{{ 'assets/javascripts/bundle.56494524.min.js' | url }}"></script> <script src="{{ 'assets/javascripts/bundle.16752b02.min.js' | url }}"></script>
{% for path in config.extra_javascript %} {% for path in config.extra_javascript %}
<script src="{{ path | url }}"></script> <script src="{{ path | url }}"></script>
{% endfor %} {% endfor %}

View File

@ -206,6 +206,7 @@ export function setupInstantLoading(
sample(response$) sample(response$)
) )
.subscribe(({ url }) => { .subscribe(({ url }) => {
console.log("history.pushState")
history.pushState({}, "", `${url}`) history.pushState({}, "", `${url}`)
}) })
@ -288,7 +289,7 @@ export function setupInstantLoading(
sample(document$) sample(document$)
) )
.subscribe(({ url, offset }) => { .subscribe(({ url, offset }) => {
if (url.hash && !offset) { if (url.hash && !offset?.y) {
setLocationHash(url.hash) setLocationHash(url.hash)
} else { } else {
window.scrollTo(0, offset?.y || 0) window.scrollTo(0, offset?.y || 0)