diff options
Diffstat (limited to 'js')
-rw-r--r-- | js/Feeds.js | 33 | ||||
-rwxr-xr-x | js/Headlines.js | 2 |
2 files changed, 6 insertions, 29 deletions
diff --git a/js/Feeds.js b/js/Feeds.js index 52c1476f7..76a6f5971 100644 --- a/js/Feeds.js +++ b/js/Feeds.js @@ -480,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) { diff --git a/js/Headlines.js b/js/Headlines.js index d01c1cb38..20ae3e1a9 100755 --- a/js/Headlines.js +++ b/js/Headlines.js @@ -255,7 +255,7 @@ define(["dojo/_base/declare"], function (declare) { let vgrhdr = `<div data-feed-id='${hl.feed_id}' class='feed-title'> <div style='float : right'>${hl.feed_icon}</div> <a class="title" href="#" onclick="Feeds.open({feed:${hl.feed_id}})">${hl.feed_title} - <a class="catchup" onclick="Feeds.catchupFeedInGroup(${hl.feed_id})" href="#">${__('mark feed as read')}</a> + <a class="catchup" title="${__('mark feed as read')}" onclick="Feeds.catchupFeedInGroup(${hl.feed_id})" href="#"><i class="material-icons">check_circle</i></a> </div>` const tmp = document.createElement("div"); |