diff options
author | Andrew Dolgov <[email protected]> | 2019-07-30 15:54:47 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2019-07-30 15:54:47 +0300 |
commit | c35a618b00b5c7a0462113d8882c5275c23500ac (patch) | |
tree | 9927388c7f8c273673e0bd663f7ef5966d598851 | |
parent | 8c982679c707aa9ae7d6fd7c8e0fa79049d18305 (diff) |
lazy load (infinite scrolling) changes:
1. invoke Headlines.loadMore() if last article row is close to becoming visible instead of relying on headlines-spacer offset to viewport
2. allow one final last lazy load request if incomplete buffer was received to permit some flexibility with unread counters possible changing while request was generated / serving remainder of articles
-rwxr-xr-x | js/Headlines.js | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/js/Headlines.js b/js/Headlines.js index 3c5ab2ee6..6abda030a 100755 --- a/js/Headlines.js +++ b/js/Headlines.js @@ -272,17 +272,21 @@ define(["dojo/_base/declare"], function (declare) { } } - if (!Feeds.infscroll_disabled) { + if (!Feeds.infscroll_disabled && !Feeds.infscroll_in_progress) { const hsp = $("headlines-spacer"); const container = $("headlines-frame"); - if (hsp && hsp.offsetTop - 250 <= container.scrollTop + container.offsetHeight) { + if (hsp && hsp.previousSibling) { + const last_row = hsp.previousSibling; - hsp.innerHTML = "<span class='loading'><img src='images/indicator_tiny.gif'> " + - __("Loading, please wait...") + "</span>"; + // invoke lazy load if last article in buffer is nearly visible + if (last_row.offsetTop - 250 <= container.scrollTop + container.offsetHeight) { + hsp.innerHTML = "<span class='loading'><img src='images/indicator_tiny.gif'> " + + __("Loading, please wait...") + "</span>"; - Headlines.loadMore(); - return; + Headlines.loadMore(); + return; + } } } @@ -558,13 +562,14 @@ define(["dojo/_base/declare"], function (declare) { const headlines_count = reply['headlines-info']['count']; - Feeds.infscroll_disabled = parseInt(headlines_count) < 30; - console.log('received', headlines_count, 'headlines, infscroll disabled=', Feeds.infscroll_disabled); - //this.vgroup_last_feed = reply['headlines-info']['vgroup_last_feed']; this.current_first_id = reply['headlines']['first_id']; + console.log('received', headlines_count, 'headlines'); + if (!append) { + Feeds.infscroll_disabled = parseInt(headlines_count) != 30; + console.log('infscroll_disabled=', Feeds.infscroll_disabled); // TODO: the below needs to be applied again when switching expanded/expandable on the fly // via hotkeys, not just on feed load @@ -663,7 +668,7 @@ define(["dojo/_base/declare"], function (declare) { } } - Feeds.infscroll_disabled = headlines_appended != 30; + Feeds.infscroll_disabled = headlines_appended == 0; console.log('appended', headlines_appended, 'headlines, infscroll_disabled=', Feeds.infscroll_disabled); @@ -682,10 +687,10 @@ define(["dojo/_base/declare"], function (declare) { } } else { - console.log("no new headlines received"); - + Feeds.infscroll_disabled = true; const first_id_changed = reply['headlines']['first_id_changed']; - console.log("first id changed:" + first_id_changed); + + console.log("no headlines received, infscroll_disabled=", Feeds.infscroll_disabled, 'first_id_changed=', first_id_changed); let hsp = $("headlines-spacer"); |