valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

catchupFeedInGroup: overhaul 

1. less hacky way to catchup actually unread headlines
2. don't fade rows away because it's inconsistent with different mark-as-read functions
3. fix stuck progress alert
This commit is contained in:
Andrew Dolgov 2018-12-09 13:52:21 +03:00
parent fa538a6c86
commit dc84e10ba1
2 changed files with 6 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
js/Feeds.js
View File

@ -480,41 +480,18 @@ define(["dojo/_base/declare"], function (declare) {
if (App.getInitParam("confirm_feed_catchup") != 1 || confirm(str)) { 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) { if (rows.length > 0) {
rows.each(function (row) { for (let i = 0; i < rows.length; i++)
row.removeClassName("Unread"); Headlines.catchup_id_batch.push(rows[i].getAttribute("data-article-id"));
if (row.getAttribute("data-article-id") != Article.getActive()) {
new Effect.Fade(row, {duration: 0.5});
}
});
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.catchupBatched(() => {
Headlines.updateFloatingTitle(true); 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) { getUnread: function(feed, is_cat) {
try { try {

2
js/Headlines.js
View File

@ -255,7 +255,7 @@ define(["dojo/_base/declare"], function (declare) {
let vgrhdr = `<div data-feed-id='${hl.feed_id}' class='feed-title'> let vgrhdr = `<div data-feed-id='${hl.feed_id}' class='feed-title'>
<div style='float : right'>${hl.feed_icon}</div> <div style='float : right'>${hl.feed_icon}</div>
<a class="title" href="#" onclick="Feeds.open({feed:${hl.feed_id}})">${hl.feed_title} <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>` </div>`
const tmp = document.createElement("div"); const tmp = document.createElement("div");