valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

various category/feed id clash fixes

This commit is contained in:
Andrew Dolgov 2006-08-01 13:53:41 +01:00
parent c0ea08b0be
commit 767e248647
4 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
feedlist.js
View File

@ -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") {

6
functions.js
View File

@ -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

2
functions.php
View File

@ -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')) {

12
tt-rss.js
View File

@ -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(), "");
}
}