From b221ed8da23a3dda54b7e3f0c27c3150a91fa200 Mon Sep 17 00:00:00 2001 From: ccd0 Date: Sun, 14 Jul 2019 23:39:47 -0700 Subject: [PATCH] Fix bug in page number highlighting when sticky causes overflow to page 11. #753 Getting the page count from boards.json would be better here but this is probably good enough. Also implement highlighting for prune position on /f/. --- src/Monitoring/ThreadStats.coffee | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/src/Monitoring/ThreadStats.coffee b/src/Monitoring/ThreadStats.coffee index 5a292d727..120d1a215 100644 --- a/src/Monitoring/ThreadStats.coffee +++ b/src/Monitoring/ThreadStats.coffee @@ -101,20 +101,27 @@ ThreadStats = onThreadsLoad: -> if @status is 200 - for page, pageNum in @response - if ThreadStats.showPurgePos - purgePos = 1 + if ThreadStats.showPurgePos + purgePos = 1 + for page in @response for thread in page.threads if thread.no < ThreadStats.thread.ID purgePos++ - ThreadStats.pageCountEl.textContent = purgePos - else - for thread in page.threads when thread.no is ThreadStats.thread.ID - ThreadStats.pageCountEl.textContent = pageNum + 1 - ThreadStats.pageCountEl.classList.toggle 'warning', (pageNum is @response.length - 1) - ThreadStats.lastPageUpdate = new Date(thread.last_modified * $.SECOND) - ThreadStats.retry() - return + ThreadStats.pageCountEl.textContent = purgePos + ThreadStats.pageCountEl.classList.toggle 'warning', (purgePos is 1) + else + i = nThreads = 0 + for page in @response + nThreads += page.threads.length + for page, pageNum in @response + for thread in page.threads + if thread.no is ThreadStats.thread.ID + ThreadStats.pageCountEl.textContent = pageNum + 1 + ThreadStats.pageCountEl.classList.toggle 'warning', (i >= nThreads - @response[0].threads.length) + ThreadStats.lastPageUpdate = new Date(thread.last_modified * $.SECOND) + ThreadStats.retry() + return + i++ else if @status is 304 ThreadStats.retry()