From cab476ac32193af7eccd355eb7cb048041ff2423 Mon Sep 17 00:00:00 2001 From: WubzyGD Date: Sat, 11 Dec 2021 12:00:10 -0700 Subject: [PATCH] preserve scrolling on refresh --- scripts/fileview/lightrefresh.js | 1 + scripts/fileview/load/render.js | 4 ++++ scripts/startup/preload.js | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/fileview/lightrefresh.js b/scripts/fileview/lightrefresh.js index af8ceac..6e0127f 100644 --- a/scripts/fileview/lightrefresh.js +++ b/scripts/fileview/lightrefresh.js @@ -1,5 +1,6 @@ const refresh = require('./refresh'); module.exports = (newPath, customOptions) => { + window.kade.currentScroll = window.scrollY; return refresh(newPath || window.kade.cpath, customOptions || {animate: false, resetNav: false, scroll: false}); }; \ No newline at end of file diff --git a/scripts/fileview/load/render.js b/scripts/fileview/load/render.js index 0182428..1f087bd 100644 --- a/scripts/fileview/load/render.js +++ b/scripts/fileview/load/render.js @@ -70,4 +70,8 @@ module.exports = (dir, options) => { } if (options.resetNav) {loadHierarchy();} + if (!options.scroll && window.kade.scrollY) { + window.scrollTo(0, window.kade.scrollY); + window.kade.scrollY = 0; + } }; \ No newline at end of file diff --git a/scripts/startup/preload.js b/scripts/startup/preload.js index 5da3de9..74c3711 100644 --- a/scripts/startup/preload.js +++ b/scripts/startup/preload.js @@ -34,7 +34,7 @@ window.addEventListener('DOMContentLoaded', () => { if (window.kade.context) {hideContext(window);} } - window.kade.refreshInterval = setInterval(lightRefresh, 60000); + window.kade.refreshInterval = setInterval(() => {if (!window.kade.modal) {lightRefresh();}}, 60000); window.kade.checkDirInterval = setInterval(checkDir, 5000); require('../keybinds/handleKey')();