From 43ebb01b631149101919befcab4739a286c39bba Mon Sep 17 00:00:00 2001 From: Christoph Kluge Date: Thu, 28 Mar 2024 15:57:24 +0100 Subject: [PATCH] fix: move scroll event behind condition --- web/frontend/src/joblist/JobList.svelte | 33 ++++++++++++------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/web/frontend/src/joblist/JobList.svelte b/web/frontend/src/joblist/JobList.svelte index 486ea3e..f3edf36 100644 --- a/web/frontend/src/joblist/JobList.svelte +++ b/web/frontend/src/joblist/JobList.svelte @@ -148,24 +148,23 @@ }); } - window.addEventListener('scroll', () => { - let { - scrollTop, - scrollHeight, - clientHeight - } = document.documentElement; - if (scrollTop + clientHeight >= scrollHeight && !usePaging && $jobsStore.data != null && $jobsStore.data.jobs.hasNextPage) { - fetchMore() - } - }); + if (!usePaging) { + let scrollMultiplier = 1 + window.addEventListener('scroll', () => { + let { + scrollTop, + scrollHeight, + clientHeight + } = document.documentElement; - let scrollMultiplier = 1 - function fetchMore() { - let pendingPaging = { ...paging } - scrollMultiplier += 1 - pendingPaging.itemsPerPage = itemsPerPage * scrollMultiplier - paging = pendingPaging - } + if (scrollTop + clientHeight >= scrollHeight && $jobsStore.data != null && $jobsStore.data.jobs.hasNextPage) { + let pendingPaging = { ...paging } + scrollMultiplier += 1 + pendingPaging.itemsPerPage = itemsPerPage * scrollMultiplier + paging = pendingPaging + }; + }); + }; let plotWidth = null; let tableWidth = null;