diff options
Diffstat (limited to 'js')
| -rw-r--r-- | js/FeedTree.js | 4 | ||||
| -rw-r--r-- | js/feedlist.js | 2 | ||||
| -rw-r--r-- | js/functions.js | 2 | ||||
| -rw-r--r-- | js/prefs.js | 9 | ||||
| -rw-r--r-- | js/viewfeed.js | 3 |
5 files changed, 9 insertions, 11 deletions
diff --git a/js/FeedTree.js b/js/FeedTree.js index 620efdbf6..bb50d6fbb 100644 --- a/js/FeedTree.js +++ b/js/FeedTree.js @@ -259,12 +259,12 @@ dojo.declare("fox.FeedTree", dijit.Tree, { if (String(root.items[i].id) == test_id) { this.expandParentNodes(feed, is_cat, parents); } else { - this.findNodeParentsAndExpandThem(feed, is_cat, root.items[i], parents); + this.findNodeParentsAndExpandThem(feed, is_cat, root.items[i], parents.slice(0)); } } } else { if (String(root.id) == test_id) { - this.expandParentNodes(feed, is_cat, parents); + this.expandParentNodes(feed, is_cat, parents.slice(0)); } } } diff --git a/js/feedlist.js b/js/feedlist.js index 3154a2887..f4e07517e 100644 --- a/js/feedlist.js +++ b/js/feedlist.js @@ -132,6 +132,8 @@ function viewfeed(feed, method, is_cat, offset, background, infscroll_req) { console.log(query); + setActiveFeedId(feed, is_cat); + new Ajax.Request("backend.php", { parameters: query, onComplete: function(transport) { diff --git a/js/functions.js b/js/functions.js index 4e4d03557..82cfa9054 100644 --- a/js/functions.js +++ b/js/functions.js @@ -508,7 +508,7 @@ function fatalError(code, msg, ext_info) { if (code == 6) { window.location.href = "index.php"; } else if (code == 5) { - window.location.href = "db-updater.php"; + window.location.href = "public.php?op=dbupdate"; } else { if (msg == "") msg = "Unknown error"; diff --git a/js/prefs.js b/js/prefs.js index b4ecd2584..b1decede5 100644 --- a/js/prefs.js +++ b/js/prefs.js @@ -975,13 +975,8 @@ function validatePrefsReset() { new Ajax.Request("backend.php", { parameters: query, onComplete: function(transport) { - var msg = transport.responseText; - if (msg.match("PREFS_THEME_CHANGED")) { - window.location.reload(); - } else { - notify_info(msg); - selectTab(); - } + updatePrefsList(); + notify_info(transport.responseText); } }); } diff --git a/js/viewfeed.js b/js/viewfeed.js index 7813ab7ef..76f9bbaee 100644 --- a/js/viewfeed.js +++ b/js/viewfeed.js @@ -49,7 +49,8 @@ function headlines_callback2(transport, offset, background, infscroll_req) { return; } - setActiveFeedId(feed_id, is_cat); + if (feed_id != getActiveFeedId() || is_cat != activeFeedIsCat()) + return; /* dijit.getEnclosingWidget( document.forms["main_toolbar_form"].update).attr('disabled', |