temporarily enable entity loader when importing opml because idk

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

diff --git a/js/FeedTree.js b/js/FeedTree.js
index f3ac8ba19587362c93e6b5c596f18daaaafba6db..6c06f00d5ea09fc775906a09579540be2b32e957 100644 (file)
--- a/js/FeedTree.js
+++ b/js/FeedTree.js
@@ -58,12 +58,12 @@ dojo.declare("fox.FeedStoreModel", dijit.tree.ForestStoreModel, {
 
                if (is_cat) {
                        treeItem = this.store._itemsByIdentity['CAT:' + feed];
-                       items = this.store._arrayOfTopLevelItems;
                } else {
                        treeItem = this.store._itemsByIdentity['FEED:' + feed];
-                       items = this.store._arrayOfAllItems;
                }
 
+               items = this.store._arrayOfAllItems;
+
                for (var i = 0; i < items.length; i++) {
                        if (items[i] == treeItem) {
 
@@ -71,14 +71,18 @@ dojo.declare("fox.FeedStoreModel", dijit.tree.ForestStoreModel, {
                                        var unread = this.store.getValue(items[j], 'unread');
                                        var id = this.store.getValue(items[j], 'id');
 
-                                       if (unread > 0 && (is_cat || id.match("FEED:"))) return items[j];
+                                       if (unread > 0 && ((is_cat && id.match("CAT:")) || (!is_cat && id.match("FEED:")))) {
+                                               if( !is_cat || ! (this.store.hasAttribute(items[j], 'parent_id') && this.store.getValue(items[j], 'parent_id') == feed) ) return items[j];
+                                       }
                                }
 
                                for (var j = 0; j < i; j++) {
                                        var unread = this.store.getValue(items[j], 'unread');
                                        var id = this.store.getValue(items[j], 'id');
 
-                                       if (unread > 0 && (is_cat || id.match("FEED:"))) return items[j];
+                                       if (unread > 0 && ((is_cat && id.match("CAT:")) || (!is_cat && id.match("FEED:")))) {
+                                               if( !is_cat || ! (this.store.hasAttribute(items[j], 'parent_id') && this.store.getValue(items[j], 'parent_id') == feed) ) return items[j];
+                                       }
                                }
                        }
                }
@@ -186,11 +190,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;
@@ -218,10 +224,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");
+
                        }
                }
 
@@ -533,7 +543,7 @@ dojo.declare("fox.FeedTree", dijit.Tree, {
                }
 
                items = this.model.store._arrayOfAllItems;
-               var item = items[0];
+               var item = items[0] == treeItem ? items[items.length-1] : items[0];
 
                for (var i = 0; i < items.length; i++) {
                        if (items[i] == treeItem) {