1
0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-25 15:31:28 +00:00

finalize changes for open-next-unread-feed-on-catchup (closes #63)

This commit is contained in:
Andrew Dolgov
2006-05-17 14:20:00 +01:00
parent e52d6bc4be
commit e0998414d8
2 changed files with 31 additions and 16 deletions

View File

@@ -28,7 +28,7 @@ function viewCategory(cat) {
viewfeed(cat, 0, '', false, true);
}
function viewfeed(feed, skip, subop, doc, is_cat) {
function viewfeed(feed, skip, subop, doc, is_cat, subop_param) {
try {
if (!doc) doc = parent.document;
@@ -91,9 +91,14 @@ function viewfeed(feed, skip, subop, doc, is_cat) {
}
setActiveFeedId(feed);
var query = "backend.php?op=viewfeed&feed=" + param_escape(feed) +
"&skip=" + param_escape(skip) + "&subop=" + param_escape(subop) +
"&view=" + param_escape(view_mode) + "&limit=" + limit +
"&smode=" + param_escape(search_mode);
if (subop == "MarkAllRead") {
var feedr = document.getElementById("FEEDR-" + feed);
var feedctr = document.getElementById("FEEDCTR-" + feed);
@@ -105,13 +110,18 @@ function viewfeed(feed, skip, subop, doc, is_cat) {
feedr.className = feedr.className.replace("Unread", "");
}
}
var feedlist = document.getElementById('feedList');
var next_unread_feed = getRelativeFeedId(feedlist,
getActiveFeedId(), "next", true);
if (next_unread_feed) {
query = query + "&nuf=" + param_escape(next_unread_feed);
setActiveFeedId(next_unread_feed);
}
}
var query = "backend.php?op=viewfeed&feed=" + param_escape(feed) +
"&skip=" + param_escape(skip) + "&subop=" + param_escape(subop) +
"&view=" + param_escape(view_mode) + "&limit=" + limit +
"&smode=" + param_escape(search_mode);
if (search_query != "") {
query = query + "&search=" + param_escape(search_query);
searchbox.value = "";
@@ -137,7 +147,7 @@ function viewfeed(feed, skip, subop, doc, is_cat) {
// cleanSelectedList("feedList");
var feedr = document.getElementById("FEEDR-" + feed);
var feedr = document.getElementById("FEEDR-" + getActiveFeedId());
if (feedr && !feedr.className.match("Selected")) {
feedr.className = feedr.className + "Selected";
}