1
0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-22 04:41:29 +00:00

functions: code cleanup

This commit is contained in:
Andrew Dolgov
2010-09-13 15:40:35 +04:00
parent 285de6d8a3
commit 201efb3e64
3 changed files with 15 additions and 88 deletions

View File

@@ -163,14 +163,22 @@ function viewfeed(feed, subop, is_cat, subop_param, skip_history, offset) {
var feedlist = $('feedList');
var next_unread_feed = getRelativeFeedId(feedlist,
feed, "next", true);
var next_unread_feed = getRelativeFeedId2(feed, false,
"next", true);
/* gRFI2 also returns categories which we don't really
* need here, so we skip them */
while (next_unread_feed && next_unread_feed.match("CAT:"))
next_unread_feed = getRelativeFeedId2(
next_unread_feed.replace("CAT:", ""),
true, "next", true);
if (!next_unread_feed) {
next_unread_feed = getRelativeFeedId(feedlist,
-3, "next", true);
next_unread_feed = getRelativeFeedId2(-3, true,
"next", true);
}
if (next_unread_feed) {
query = query + "&nuf=" + param_escape(next_unread_feed);
//setActiveFeedId(next_unread_feed);