summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xjs/FeedTree.js2
-rw-r--r--js/Feeds.js6
2 files changed, 4 insertions, 4 deletions
diff --git a/js/FeedTree.js b/js/FeedTree.js
index b43cad627..1dcbae3f9 100755
--- a/js/FeedTree.js
+++ b/js/FeedTree.js
@@ -353,7 +353,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "dijit/Tree", "dijit/Menu"],
if (node) {
const check_unread = tree.model.getFeedUnread(bare_id, true);
- if (hide && cat_unread <= 0 && check_unread == 0 && (id != "CAT:-1" || !show_special)) {
+ if (hide && cat_unread <= 0 && check_unread <= 0 && (id != "CAT:-1" || !show_special)) {
Effect.Fade(node[0].rowNode, {duration : 0.3,
queue: { position: 'end', scope: 'FFADE-' + id, limit: 1 }});
} else {
diff --git a/js/Feeds.js b/js/Feeds.js
index 524045eb2..cb3cc3612 100644
--- a/js/Feeds.js
+++ b/js/Feeds.js
@@ -3,7 +3,7 @@
define(["dojo/_base/declare"], function (declare) {
Feeds = {
counters_last_request: 0,
- _active_feed_id: 0,
+ _active_feed_id: undefined,
_active_feed_is_cat: false,
infscroll_in_progress: 0,
infscroll_disabled: 0,
@@ -99,9 +99,9 @@ define(["dojo/_base/declare"], function (declare) {
PluginHost.run(PluginHost.HOOK_COUNTERS_PROCESSED);
},
reloadCurrent: function(method) {
- console.log("reloadCurrent: " + method);
-
if (this.getActive() != undefined) {
+ console.log("reloadCurrent: " + method);
+
this.open({feed: this.getActive(), is_cat: this.activeIsCat(), method: method});
}
return false; // block unneeded form submits