diff options
author | Andrew Dolgov <[email protected]> | 2006-08-01 13:53:41 +0100 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2006-08-01 13:53:41 +0100 |
commit | 767e2486475e4e3e5e6604980f339c6f154b11f4 (patch) | |
tree | 748fa6de83c1c0b271a5212a61836fe44513ff17 | |
parent | c0ea08b0beafdeb0b17781d296cf6ea188227fa9 (diff) |
various category/feed id clash fixes
-rw-r--r-- | feedlist.js | 10 | ||||
-rw-r--r-- | functions.js | 6 | ||||
-rw-r--r-- | functions.php | 2 | ||||
-rw-r--r-- | tt-rss.js | 12 |
4 files changed, 16 insertions, 14 deletions
diff --git a/feedlist.js b/feedlist.js index 7729da921..4795b16ef 100644 --- a/feedlist.js +++ b/feedlist.js @@ -2,10 +2,10 @@ var xmlhttp = Ajax.getTransport(); function viewCategory(cat) { getMainContext().active_feed_is_cat = true; - viewfeed(cat, 0, '', false, true); + viewfeed(cat, '', true); } -function viewfeed(feed, skip, subop, doc, is_cat, subop_param) { +function viewfeed(feed, subop, is_cat, subop_param) { try { enableHotkeys(); @@ -40,7 +40,7 @@ function viewfeed(feed, skip, subop, doc, is_cat, subop_param) { parent.closeInfoBox(true); } - debug("CVMODE: " + activeFeedIsCat()); + debug("IS_CAT_STORED: " + activeFeedIsCat() + ", IS_CAT: " + is_cat); var fe = document.getElementById("FEEDR-" + getActiveFeedId()); @@ -50,7 +50,9 @@ function viewfeed(feed, skip, subop, doc, is_cat, subop_param) { setActiveFeedId(feed); - getMainContext().active_feed_is_cat = is_cat; + if (is_cat != undefined) { + getMainContext().active_feed_is_cat = is_cat; + } if (subop == "MarkAllRead") { diff --git a/functions.js b/functions.js index 08dcfc66b..ed8340444 100644 --- a/functions.js +++ b/functions.js @@ -187,7 +187,7 @@ function hotkey_handler(e) { if (keycode == 85) { // u if (getActiveFeedId()) { - return f_ctx.viewfeed(getActiveFeedId(), 0, "ForceUpdate"); + return f_ctx.viewfeed(getActiveFeedId(), "ForceUpdate"); } } @@ -201,13 +201,13 @@ function hotkey_handler(e) { if (keycode == 74) { // j var feed = getActiveFeedId(); var new_feed = getRelativeFeedId(feedlist, feed, 'prev'); - if (new_feed) viewfeed(new_feed, 0, ''); + if (new_feed) viewfeed(new_feed, ''); } if (keycode == 75) { // k var feed = getActiveFeedId(); var new_feed = getRelativeFeedId(feedlist, feed, 'next'); - if (new_feed) viewfeed(new_feed, 0, ''); + if (new_feed) viewfeed(new_feed, ''); } if (keycode == 78 || keycode == 40) { // n, down diff --git a/functions.php b/functions.php index 0a3d3f0f5..af9cd222f 100644 --- a/functions.php +++ b/functions.php @@ -852,7 +852,7 @@ $link_title = "Updated: $last_updated"; } - $feed = "<a title=\"$link_title\" id=\"FEEDL-$feed_id\" href=\"javascript:viewfeed('$feed_id', 0);\">$feed_title</a>"; + $feed = "<a title=\"$link_title\" id=\"FEEDL-$feed_id\" href=\"javascript:viewfeed('$feed_id', '', false);\">$feed_title</a>"; print "<li id=\"FEEDR-$feed_id\" class=\"$class\">"; if (get_pref($link, 'ENABLE_FEED_ICONS')) { @@ -239,20 +239,20 @@ function catchupAllFeeds() { } -function viewCurrentFeed(skip, subop) { +function viewCurrentFeed(subop) { if (getActiveFeedId()) { - viewfeed(getActiveFeedId(), skip, subop); + viewfeed(getActiveFeedId(), subop); } else { disableContainerChildren("headlinesToolbar", false, document); - viewfeed(-1, skip, subop); // FIXME + viewfeed(-1, subop); // FIXME } return false; // block unneeded form submits } -function viewfeed(feed, skip, subop) { +function viewfeed(feed, subop) { var f = window.frames["feeds-frame"]; - f.viewfeed(feed, skip, subop); + f.viewfeed(feed, subop); } function timeout() { @@ -270,7 +270,7 @@ function resetSearch() { if (searchbox.value != "" && getActiveFeedId()) { searchbox.value = ""; - viewfeed(getActiveFeedId(), 0, ""); + viewfeed(getActiveFeedId(), ""); } } |