diff options
Diffstat (limited to 'js/Feeds.js')
| -rw-r--r-- | js/Feeds.js | 44 |
1 files changed, 9 insertions, 35 deletions
diff --git a/js/Feeds.js b/js/Feeds.js index 70b5176f4..76a6f5971 100644 --- a/js/Feeds.js +++ b/js/Feeds.js @@ -213,6 +213,8 @@ define(["dojo/_base/declare"], function (declare) { App.setLoadingProgress(50); document.onkeydown = (event) => { return App.hotkeyHandler(event) }; + window.onresize = () => { Headlines.scrollHandler(); } + window.setInterval(() => { Headlines.catchupBatched() }, 10 * 1000); if (!this.getActive()) { @@ -338,11 +340,6 @@ define(["dojo/_base/declare"], function (declare) { if (offset != 0) { query.skip = offset; - - // to prevent duplicate feed titles when showing grouped vfeeds - if (Headlines.vgroup_last_feed != undefined) { - query.vgrlf = Headlines.vgroup_last_feed; - } } else if (!is_cat && feed == this.getActive() && !params.method) { query.m = "ForceUpdate"; } @@ -361,7 +358,7 @@ define(["dojo/_base/declare"], function (declare) { if (viewfeed_debug) { window.open("backend.php?" + dojo.objectToQuery( - Object.assign({debug: 1, csrf_token: App.getInitParam("csrf_token")}, query) + Object.assign({csrf_token: App.getInitParam("csrf_token")}, query) )); } @@ -483,40 +480,17 @@ define(["dojo/_base/declare"], function (declare) { if (App.getInitParam("confirm_feed_catchup") != 1 || confirm(str)) { - const rows = $$("#headlines-frame > div[id*=RROW][data-orig-feed-id='" + id + "']"); + const rows = $$("#headlines-frame > div[id*=RROW][class*=Unread][data-orig-feed-id='" + id + "']"); if (rows.length > 0) { - rows.each(function (row) { - row.removeClassName("Unread"); - - if (row.getAttribute("data-article-id") != Article.getActive()) { - new Effect.Fade(row, {duration: 0.5}); - } + for (let i = 0; i < rows.length; i++) + Headlines.catchup_id_batch.push(rows[i].getAttribute("data-article-id")); + Headlines.catchupBatched(() => { + Headlines.updateFloatingTitle(true); }); - - const feedTitles = $$("#headlines-frame > div[class='feed-title']"); - - for (let i = 0; i < feedTitles.length; i++) { - if (feedTitles[i].getAttribute("data-feed-id") == id) { - - if (i < feedTitles.length - 1) { - new Effect.Fade(feedTitles[i], {duration: 0.5}); - } - - break; - } - } - - Headlines.updateFloatingTitle(true); } - - Notify.progress("Loading, please wait...", true); - - xhrPost("backend.php", {op: "rpc", method: "catchupFeed", feed_id: id, is_cat: false}, (transport) => { - App.handleRpcJson(transport); - }); } }, getUnread: function(feed, is_cat) { @@ -627,7 +601,7 @@ define(["dojo/_base/declare"], function (declare) { updateRandom: function() { console.log("in update_random_feed"); - xhrPost("backend.php", {op: "rpc", method: "updateRandom"}, (transport) => { + xhrPost("backend.php", {op: "rpc", method: "updaterandomfeed"}, (transport) => { App.handleRpcJson(transport, true); }); }, |