parser: fix get_links() for RSS

[tt-rss.git] / js / FeedTree.js

diff --git a/js/FeedTree.js b/js/FeedTree.js
index d80f4606204148f9cbfb0b5ee1aecf8dcf68c478..e35417dafd1e844b04c696667048a5d77dacf805 100644 (file)
--- a/js/FeedTree.js
+++ b/js/FeedTree.js
@@ -186,11 +186,13 @@ dojo.declare("fox.FeedTree", dijit.Tree, {
 
                ctr = dojo.doc.createElement('span');
                ctr.className = 'counterNode';
-               ctr.innerHTML = args.item.unread;
+               ctr.innerHTML = args.item.unread > 0 ? args.item.unread : args.item.auxcounter;
 
                //args.item.unread > 0 ? ctr.addClassName("unread") : ctr.removeClassName("unread");
 
-               args.item.unread > 0 ? Element.show(ctr) : Element.hide(ctr);
+               args.item.unread > 0 || args.item.auxcounter > 0 ? Element.show(ctr) : Element.hide(ctr);
+
+               args.item.unread == 0 && args.item.auxcounter > 0 ? ctr.addClassName("aux") : ctr.removeClassName("aux");
 
                dojo.place(ctr, tnode.rowNode, 'first');
                tnode.counterNode = ctr;
@@ -200,6 +202,9 @@ dojo.declare("fox.FeedTree", dijit.Tree, {
        },
        postCreate: function() {
                this.connect(this.model, "onChange", "updateCounter");
+               this.connect(this, "_expandNode", function() {
+                       this.hideRead(getInitParam("hide_read_feeds"), getInitParam("hide_read_shows_special"));
+               });
 
                this.inherited(arguments);
        },
@@ -215,10 +220,14 @@ dojo.declare("fox.FeedTree", dijit.Tree, {
 
                        if (node.counterNode) {
                                ctr = node.counterNode;
-                               ctr.innerHTML = item.unread;
-                               item.unread > 0 ? Effect.Appear(ctr, {duration : 0.3,
+                               ctr.innerHTML = item.unread > 0 ? item.unread : item.auxcounter;
+                               item.unread > 0 || item.auxcounter > 0 ?
+                                       Effect.Appear(ctr, {duration : 0.3,
                                        queue: { position: 'end', scope: 'CAPPEAR-' + item.id, limit: 1 }}) :
                                                Element.hide(ctr);
+
+                               item.unread == 0 && item.auxcounter > 0 ? ctr.addClassName("aux") : ctr.removeClassName("aux");
+
                        }
                }