diff options
| -rw-r--r-- | feedlist.js | 20 | ||||
| -rw-r--r-- | functions.js | 81 | ||||
| -rw-r--r-- | viewfeed.js | 2 |
3 files changed, 15 insertions, 88 deletions
diff --git a/feedlist.js b/feedlist.js index 8860424b1..3d9acafd1 100644 --- a/feedlist.js +++ b/feedlist.js @@ -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); diff --git a/functions.js b/functions.js index 2266bfc25..43de38c98 100644 --- a/functions.js +++ b/functions.js @@ -1093,70 +1093,6 @@ function getRelativeFeedId2(id, is_cat, direction, unread_only) { } } -function getRelativeFeedId(list, id, direction, unread_only) { - var rows = list.getElementsByTagName("LI"); - var feeds = new Array(); - - for (var i = 0; i < rows.length; i++) { - if (rows[i].id.match("FEEDR-")) { - - if (rows[i].id == "FEEDR-" + id || (Element.visible(rows[i]) && Element.visible(rows[i].parentNode))) { - - if (!unread_only || - (rows[i].className.match("Unread") || rows[i].id == "FEEDR-" + id)) { - feeds.push(rows[i].id.replace("FEEDR-", "")); - } - } - } - } - - if (!id) { - if (direction == "next") { - return feeds.shift(); - } else { - return feeds.pop(); - } - } else { - if (direction == "next") { - var idx = feeds.indexOf(id); - if (idx != -1 && idx < feeds.length) { - return feeds[idx+1]; - } else { - return getRelativeFeedId(list, false, direction, unread_only); - } - } else { - var idx = feeds.indexOf(id); - if (idx > 0) { - return feeds[idx-1]; - } else { - return getRelativeFeedId(list, false, direction, unread_only); - } - } - - } -} - -function showBlockElement(id, h_id) { - var elem = $(id); - - if (elem) { - elem.style.display = "block"; - - if (h_id) { - elem = $(h_id); - if (elem) { - elem.style.display = "none"; - } - } - } else { - alert("[showBlockElement] can't find element with id " + id); - } -} - -function appearBlockElement_afh(effect) { - -} - function checkboxToggleElement(elem, id) { if (elem.checked) { Effect.Appear(id, {duration : 0.5}); @@ -1165,23 +1101,6 @@ function checkboxToggleElement(elem, id) { } } -function appearBlockElement(id, h_id) { - - try { - if (h_id) { - Effect.Fade(h_id); - } - Effect.SlideDown(id, {duration : 1.0, afterFinish: appearBlockElement_afh}); - } catch (e) { - exception_error("appearBlockElement", e); - } - -} - -function hideParentElement(e) { - e.parentNode.style.display = "none"; -} - function dropboxSelect(e, v) { for (i = 0; i < e.length; i++) { if (e[i].value == v) { diff --git a/viewfeed.js b/viewfeed.js index 4a7cc9e7f..73ad35f0a 100644 --- a/viewfeed.js +++ b/viewfeed.js @@ -2062,7 +2062,7 @@ function cdmExpandArticle(a_id) { } catch (e) { - exception_error("appearBlockElementF", e); + exception_error("cdmExpandArticle", e); } } |