code cleanup

[tt-rss.git] / feedlist.js

diff --git a/feedlist.js b/feedlist.js
index 428a054f190e52a1399027de3e9721907fcc8706..071887a1b5cbaf40cef170fe30df1aa266589089 100644 (file)
--- a/feedlist.js
+++ b/feedlist.js
@@ -224,61 +224,13 @@ function viewfeed(feed, subop, is_cat, offset) {
 
                } else {
 
-//                     if (!page_offset) {
-                               var feedr;
-
-                               if (is_cat) {
-                                       feedr = $('FCAP-' + feed);
-                               } else {
-                                       feedr = $('FEEDR-' + feed);
-                               }
-
-                               if (feedr && !$('FLL-' + feed)) {
-
-                                       var img = $('FIMG-' + feed);
-
-                                       if (!is_cat && img) {
-
-                                               var cat_list = feedr.parentNode;
-
-                                               if (!cat_list || Element.visible(cat_list)) {
-                                                       if (!img.src.match("indicator_white")) {
-                                                               img.alt = img.src;
-                                                               img.src = getInitParam("sign_progress");
-                                                       }
-                                               } else if (cat_list) {
-                                                       feed_cat_id = cat_list.id.replace("FCATLIST-", "");
-
-                                                       if (!$('FLL-' + feed_cat_id)) {
-
-                                                               var ll = document.createElement('img');
-
-                                                               ll.src = getInitParam("sign_progress_tiny");
-                                                               ll.className = 'hlLoading';
-                                                               ll.id = 'FLL-' + feed;
-
-                                                               $("FCAP-" + feed_cat_id).appendChild(ll);
-                                                       }
-                                               } 
-                                       
-                                       } else {
-
-                                               if (!$('FLL-' + feed)) {
-                                                       var ll = document.createElement('img');
-
-                                                       ll.src = getInitParam("sign_progress_tiny");
-                                                       ll.className = 'hlLoading';
-                                                       ll.id = 'FLL-' + feed;
-       
-                                                       feedr.appendChild(ll);
-                                               }
-                                       }
-                               } 
-//                     }  
+                       if (!is_cat)
+                               setFeedExpandoIcon(feed, is_cat, 'images/indicator_white.gif');
 
                        new Ajax.Request("backend.php", {
                                parameters: query,
                                onComplete: function(transport) { 
+                                       setFeedExpandoIcon(feed, is_cat, 'images/blank_icon.gif');
                                        headlines_callback2(transport, page_offset); 
                                } });
                }
@@ -406,11 +358,7 @@ function request_counters_real() {
 
                var query = "?op=rpc&subop=getAllCounters&seq=" + next_seq();
 
-               if (tagsAreDisplayed()) {
-                       query = query + "&omode=tl";
-               } else {
-                       query = query + "&omode=flc";
-               }
+               query = query + "&omode=flc";
 
                new Ajax.Request("backend.php", {
                        parameters: query,
@@ -641,6 +589,8 @@ function resort_feedlist() {
 function hideOrShowFeeds(hide) {
        var tree = dijit.byId("feedTree");
 
+       if (!tree) return;
+
        if (getInitParam("enable_feed_cats")) {
 
                var cats = tree.model.store._arrayOfTopLevelItems;
@@ -690,6 +640,9 @@ function hideOrShowFeedsCategory(feeds, hide) {
        try {
                //console.warn("hideOrShowFeedsCategory: function not implemented");
        var tree = dijit.byId("feedTree");
+
+       if (!tree) return;
+
        var cat_unread = 0;
 
        feeds.each(function(feed) {
@@ -887,6 +840,7 @@ function setFeedUnread(feed, is_cat, unread) {
 function setFeedValue(feed, is_cat, key, value) {
        try {
                if (!value) value = '';
+               if (!treeModel) return;
 
                if (is_cat) 
                        treeItem = treeModel.store._itemsByIdentity['CAT:' + feed];
@@ -909,6 +863,8 @@ function selectFeed(feed, is_cat) {
        try {
                var tree = dijit.byId("feedTree");
 
+               if (!tree) return;
+
                if (is_cat) 
                        treeNode = tree._itemNodesMap['CAT:' + feed];
                else
@@ -929,6 +885,8 @@ function setFeedIcon(feed, is_cat, src) {
        try {
                var tree = dijit.byId("feedTree");
 
+               if (!tree) return;
+
                if (is_cat) 
                        treeNode = tree._itemNodesMap['CAT:' + feed];
                else
@@ -943,3 +901,24 @@ function setFeedIcon(feed, is_cat, src) {
                exception_error("setFeedIcon", e);
        }
 }
+
+function setFeedExpandoIcon(feed, is_cat, src) {
+       try {
+               var tree = dijit.byId("feedTree");
+
+               if (!tree) return;
+
+               if (is_cat) 
+                       treeNode = tree._itemNodesMap['CAT:' + feed];
+               else
+                       treeNode = tree._itemNodesMap['FEED:' + feed];
+
+               if (treeNode) {
+                       treeNode = treeNode[0];
+                       treeNode.expandoNode.src = src;
+               }
+
+       } catch (e) {
+               exception_error("setFeedIcon", e);
+       }
+}