mirror of
https://git.tt-rss.org/git/tt-rss.git
synced 2025-12-14 03:05:55 +00:00
various category/feed id clash fixes
This commit is contained in:
12
tt-rss.js
12
tt-rss.js
@@ -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(), "");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user