diff options
author | Andrew Dolgov <[email protected]> | 2018-12-01 10:19:45 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2018-12-01 10:19:45 +0300 |
commit | b87b4287b720e02f3fd4ffd4b4c8642b92e5c494 (patch) | |
tree | 7fa32a0c3f52b978933ab81a9d6a7fc28cccd480 /js/viewfeed.js | |
parent | 8d190d539b8c7aff3a6b2b24f03bdc1db6681b1b (diff) |
scroll handler: fix loadMoreHeadlines() not being called
Diffstat (limited to 'js/viewfeed.js')
-rwxr-xr-x | js/viewfeed.js | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/js/viewfeed.js b/js/viewfeed.js index a2aac43d0..d7db88d37 100755 --- a/js/viewfeed.js +++ b/js/viewfeed.js @@ -1117,32 +1117,38 @@ function unpackVisibleHeadlines() { } } -function headlinesScrollHandler(e) { +function headlinesScrollHandler(event) { try { unpackVisibleHeadlines(); - // set topmost child in the buffer as active - if (isCombinedMode() && getInitParam("cdm_expanded") && getInitParam("cdm_auto_catchup") == 1) { - const rows = $$("#headlines-frame > div[id*=RROW]"); + if (isCombinedMode()) { + updateFloatingTitle(); - for (let i = 0; i < rows.length; i++) { - const row = rows[i]; + // set topmost child in the buffer as active + if (getInitParam("cdm_expanded") && getInitParam("cdm_auto_catchup") == 1) { - if ($("headlines-frame").scrollTop <= row.offsetTop && - row.offsetTop - $("headlines-frame").scrollTop < 100 && - row.getAttribute("data-article-id") != getActiveArticleId()) { + const rows = $$("#headlines-frame > div[id*=RROW]"); - setActiveArticleId(row.getAttribute("data-article-id")); - break; + for (let i = 0; i < rows.length; i++) { + const row = rows[i]; + + if ($("headlines-frame").scrollTop <= row.offsetTop && + row.offsetTop - $("headlines-frame").scrollTop < 100 && + row.getAttribute("data-article-id") != getActiveArticleId()) { + + setActiveArticleId(row.getAttribute("data-article-id")); + break; + } } } } if (!_infscroll_disable) { const hsp = $("headlines-spacer"); + const container = $("headlines-frame"); - if (hsp && hsp.offsetTop - 250 <= e.scrollTop + e.offsetHeight) { + if (hsp && hsp.offsetTop - 250 <= container.scrollTop + container.offsetHeight) { hsp.innerHTML = "<span class='loading'><img src='images/indicator_tiny.gif'> " + __("Loading, please wait...") + "</span>"; @@ -1153,10 +1159,6 @@ function headlinesScrollHandler(e) { } } - if (isCombinedMode()) { - updateFloatingTitle(); - } - if (getInitParam("cdm_auto_catchup") == 1) { let rows = $$("#headlines-frame > div[id*=RROW][class*=Unread]"); |