blallo/tt-rss
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

loadMoreHeadlines: fix for unread view

Browse source 
decrementFeedCounter: do not apply counter hacks when dealing with
subcategory entries
This commit is contained in:
Andrew Dolgov 2012-08-28 16:02:44 +04:00
parent 5089b30b4f
commit 455e774a3a
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
js/feedlist.js
View file

@ -19,7 +19,6 @@ function loadMoreHeadlines() {
var offset = 0; var offset = 0;
var view_mode = document.forms["main_toolbar_form"].view_mode.value; var view_mode = document.forms["main_toolbar_form"].view_mode.value;
var num_unread = getFeedUnread(getActiveFeedId(), activeFeedIsCat());
var unread_in_buffer = $$("#headlines-frame > div[id*=RROW][class*=Unread]").length; var unread_in_buffer = $$("#headlines-frame > div[id*=RROW][class*=Unread]").length;
var num_all = $$("#headlines-frame > div[id*=RROW]").length; var num_all = $$("#headlines-frame > div[id*=RROW]").length;
@ -32,9 +31,9 @@ function loadMoreHeadlines() {
console.warn("loadMoreHeadlines: published is not implemented, falling back."); console.warn("loadMoreHeadlines: published is not implemented, falling back.");
offset = num_all; offset = num_all;
} else if (view_mode == "unread") { } else if (view_mode == "unread") {
offset = num_unread; offset = unread_in_buffer;
} else if (view_mode == "adaptive") { } else if (view_mode == "adaptive") {
if (num_unread > 0) if (unread_in_buffer > 0)
offset = unread_in_buffer; offset = unread_in_buffer;
else else
offset = num_all; offset = num_all;
@ -575,6 +574,11 @@ function catchupFeed(feed, is_cat) {
function decrementFeedCounter(feed, is_cat) { function decrementFeedCounter(feed, is_cat) {
try { try {
// we have subcats, no way to figure out if this article is
// actually from this category
if (is_cat && getCatParam(feed) > 0)
return;
var ctr = getFeedUnread(feed, is_cat); var ctr = getFeedUnread(feed, is_cat);
if (ctr > 0) { if (ctr > 0) {