Skip to content

Commit a9bf0d4

Browse files
committed
Fix page variables existing outside fpdb object
1 parent 0c51652 commit a9bf0d4

1 file changed

Lines changed: 11 additions & 11 deletions

File tree

search/search.js

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -155,15 +155,15 @@ function performSearch() {
155155

156156
fetch(`${fpdb.api}/search?${params.join('&')}&fields=id,title,developer,publisher,platform,library,tags,originalDescription,dateAdded,dateModified`).then(r => r.json()).then(json => {
157157
fpdb.list = json;
158-
pages = Math.ceil(fpdb.list.length / 100);
158+
fpdb.pages = Math.ceil(fpdb.list.length / 100);
159159

160160
document.querySelector('.results-total').textContent = fpdb.list.length.toLocaleString();
161-
document.querySelectorAll('.results-max-pages').forEach(elem => { elem.textContent = pages.toLocaleString(); });
161+
document.querySelectorAll('.results-max-pages').forEach(elem => { elem.textContent = fpdb.pages.toLocaleString(); });
162162

163163
document.querySelector('.results > .common-loading').hidden = true;
164164
document.querySelector('.results-top').style.display = 'flex';
165165
document.querySelector('.results-list').hidden = false;
166-
document.querySelectorAll('.results-navigate').forEach(elem => { elem.hidden = pages < 2; });
166+
document.querySelectorAll('.results-navigate').forEach(elem => { elem.hidden = fpdb.pages < 2; });
167167

168168
applySort();
169169
});
@@ -198,8 +198,8 @@ function loadPage(page) {
198198
while (htmlList.firstChild)
199199
htmlList.removeChild(htmlList.firstChild);
200200

201-
currentPage = page;
202-
document.querySelectorAll('.results-current-page').forEach(elem => { elem.textContent = currentPage.toLocaleString(); });
201+
fpdb.currentPage = page;
202+
document.querySelectorAll('.results-current-page').forEach(elem => { elem.textContent = fpdb.currentPage.toLocaleString(); });
203203
document.querySelector('.results').scrollTop = 0;
204204

205205
for (let i = (page - 1) * 100; i < Math.min(fpdb.list.length, page * 100); i++) {
@@ -262,7 +262,7 @@ function loadPage(page) {
262262
function loadPageFromInput(input) {
263263
let value = parseInt(input.value, 10);
264264

265-
if (!isNaN(value) && value != currentPage && value > 0 && value <= pages) {
265+
if (!isNaN(value) && value != fpdb.currentPage && value > 0 && value <= fpdb.pages) {
266266
loadPage(value);
267267
input.value = '';
268268
}
@@ -406,16 +406,16 @@ function backToResults() {
406406
document.querySelector('.viewer').style.display = 'none';
407407
document.querySelector('.results-top').style.display = 'flex';
408408
document.querySelector('.results-list').hidden = false;
409-
document.querySelector('.results-bottom').hidden = pages < 2;
409+
document.querySelector('.results-bottom').hidden = fpdb.pages < 2;
410410
document.querySelector('.results').scrollTop = fpdb.lastScrollPos;
411411
}
412412

413413
document.querySelector('.search-button').addEventListener('click', performSearch);
414414

415-
document.querySelectorAll('.results-first-page').forEach(elem => elem.addEventListener('click', () => { if (currentPage > 1) loadPage(1); }));
416-
document.querySelectorAll('.results-back-page').forEach(elem => elem.addEventListener('click', () => { if (currentPage > 1) loadPage(currentPage - 1); }));
417-
document.querySelectorAll('.results-forward-page').forEach(elem => elem.addEventListener('click', () => { if (currentPage < pages) loadPage(currentPage + 1); }));
418-
document.querySelectorAll('.results-last-page').forEach(elem => elem.addEventListener('click', () => { if (currentPage < pages) loadPage(pages); }));
415+
document.querySelectorAll('.results-first-page').forEach(elem => elem.addEventListener('click', () => { if (fpdb.currentPage > 1) loadPage(1); }));
416+
document.querySelectorAll('.results-back-page').forEach(elem => elem.addEventListener('click', () => { if (fpdb.currentPage > 1) loadPage(fpdb.currentPage - 1); }));
417+
document.querySelectorAll('.results-forward-page').forEach(elem => elem.addEventListener('click', () => { if (fpdb.currentPage < fpdb.pages) loadPage(fpdb.currentPage + 1); }));
418+
document.querySelectorAll('.results-last-page').forEach(elem => elem.addEventListener('click', () => { if (fpdb.currentPage < fpdb.pages) loadPage(fpdb.pages); }));
419419

420420
document.querySelectorAll('.results-go-to-page').forEach((elem, i) => elem.addEventListener('click', () => loadPageFromInput(document.querySelectorAll('.results-input-page')[i])));
421421
document.querySelectorAll('.results-input-page').forEach(elem => elem.addEventListener('keyup', e => { if (e.key == 'Enter') loadPageFromInput(e.target); }));

0 commit comments

Comments
 (0)