]> git.wh0rd.org - tt-rss.git/blobdiff - feedlist.js
code cleanup
[tt-rss.git] / feedlist.js
index 1f9bd8ff5999f1ddd4e28f6c5947ad38249845f5..071887a1b5cbaf40cef170fe30df1aa266589089 100644 (file)
@@ -3,10 +3,6 @@ var _infscroll_disable = 0;
 var _infscroll_request_sent = 0;
 var feed_under_pointer = undefined;
 
-var mouse_is_down = false;
-var mouse_y = 0;
-var mouse_x = 0;
-
 var counter_timeout_id = false;
 
 var resize_enabled = false;
@@ -17,7 +13,7 @@ var feeds_sort_by_unread = false;
 var feedlist_sortable_enabled = false;
 
 function toggle_sortable_feedlist(enabled) {
-       try {
+/*     try {
 
                if (enabled) {
                        Sortable.create('feedList', {onChange: feedlist_dragsorted, only: "feedCat"});
@@ -27,7 +23,7 @@ function toggle_sortable_feedlist(enabled) {
 
        } catch (e) {
                exception_error("toggle_sortable_feedlist", e);
-       }
+       } */
 }
 
 function viewCategory(cat) {
@@ -35,20 +31,6 @@ function viewCategory(cat) {
        return false;
 }
 
-function render_feedlist(data) {
-       try {
-
-               var f = $("feeds-frame");
-               f.innerHTML = data;
-//             cache_invalidate("FEEDLIST");
-//             cache_inject("FEEDLIST", data, getInitParam("num_feeds"));
-               feedlist_init();
-
-       } catch (e) {
-               exception_error("render_feedlist", e);
-       }
-}
-
 function viewNextFeedPage() {
        try {
                //if (!getActiveFeedId()) return;
@@ -67,8 +49,6 @@ function viewfeed(feed, subop, is_cat, offset) {
        try {
                if (is_cat == undefined) is_cat = false;
 
-               if (offline_mode) return viewfeed_offline(feed, subop, is_cat, offset);
-
 //             if (!offset) page_offset = 0;
 
                last_requested_article = 0;
@@ -147,8 +127,6 @@ function viewfeed(feed, subop, is_cat, offset) {
 
                if (subop == "MarkAllRead") {
 
-                       catchup_local_feed(feed, is_cat);
-
                        var show_next_feed = getInitParam("on_catchup_show_next_feed") == "1";
 
                        if (show_next_feed) {
@@ -210,14 +188,6 @@ function viewfeed(feed, subop, is_cat, offset) {
 
                Form.enable("main_toolbar_form");
 
-               // for piggybacked counters
-
-               if (tagsAreDisplayed()) {
-                       query = query + "&omode=lt";
-               } else {
-                       query = query + "&omode=flc";
-               }
-
                console.log(query);
 
                var container = $("headlinesInnerContainer");
@@ -243,86 +213,24 @@ function viewfeed(feed, subop, is_cat, offset) {
                }
 
                if (cache_check) {
-                       var f = $("headlines-frame");
-
-                       clean_feed_selections();
 
                        setActiveFeedId(feed, is_cat);
                
-                       if (!is_cat) {
-                               var feedr = $("FEEDR-" + feed);
-                               if (feedr && !feedr.className.match("Selected")) {      
-                                       feedr.className = feedr.className + "Selected";
-                               } 
-                       } else {
-                               var feedr = $("FCAT-" + feed_id);
-                               if (feedr && !feedr.className.match("Selected")) {      
-                                       feedr.className = feedr.className + "Selected";
-                               } 
-                       }
-
-                       f.innerHTML = cache_find_param(cache_prefix + feed, unread_ctr);
+                       $("headlines-frame").innerHTML = cache_find_param(cache_prefix + feed, 
+                               unread_ctr);
 
                        request_counters();
                        remove_splash();
 
                } 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); 
                                } });
                }
@@ -332,76 +240,15 @@ function viewfeed(feed, subop, is_cat, offset) {
        }               
 }
 
-function toggleCollapseCat_af(effect) {
-       //var caption = elem.id.replace("FCATLIST-", "");
-
-       try {
-
-               var elem = effect.element;
-               var cat = elem.id.replace("FCATLIST-", "");
-               var cap = $("FCAP-" + cat);
-
-               if (Element.visible(elem)) {
-                       cap.innerHTML = cap.innerHTML.replace("…", "");
-               } else {
-                       if (cap.innerHTML.lastIndexOf("…") != cap.innerHTML.length-3) {
-                               cap.innerHTML = cap.innerHTML + "…";
-                       }
-               }
-
-       } catch (e) {
-               exception_error("toggleCollapseCat_af", e);
-       }
-}
-
-function toggleCollapseCat(cat) {
-       try {
-       
-               var cat_elem = $("FCAT-" + cat);
-               var cat_list = $("FCATLIST-" + cat).parentNode;
-               var caption = $("FCAP-" + cat);
-               
-               Effect.toggle('FCATLIST-' + cat, 'blind', { duration: 0.5,
-                       afterFinish: toggleCollapseCat_af });
-
-               var img = cat_elem.getElementsByTagName("IMG")[0];
-
-               if (img.src.match("-collapse"))
-                       img.src = img.src.replace("-collapse", "-uncollapse")
-               else
-                       img.src = img.src.replace("-uncollapse", "-collapse")
-
-               new Ajax.Request("backend.php", 
-                       { parameters: "backend.php?op=feeds&subop=collapse&cid=" + 
-                               param_escape(cat) } );
-
-               local_collapse_cat(cat);
-
-       } catch (e) {
-               exception_error("toggleCollapseCat", e);
-       }
-}
-
-function isCatCollapsed(cat) {
-       try {
-               return Element.visible("FCATLIST-" + cat);
-       } catch (e) {
-               exception_error("isCatCollapsed", e);
-       }
-}
 
 function feedlist_dragsorted(ctr) {
        try {
-               var elem = $("feedList");
-
-               var cats = elem.getElementsByTagName("LI");
-               var ordered_cats = new Array();
+               var cats = $$("#feedList > li[id*=FCAT-]");
+               var ordered_cats = [];
 
-               for (var i = 0; i < cats.length; i++) {
-                       if (cats[i].id && cats[i].id.match("FCAT-")) {
-                               ordered_cats.push(cats[i].id.replace("FCAT-", ""));
-                       }
-               }
+               cats.each(function(cat) {
+                       ordered_cats.push(cat.id.replace("FCAT-", ""));
+               });
 
                if (ordered_cats.length > 0) {
 
@@ -422,37 +269,33 @@ function feedlist_init() {
        try {
                loading_set_progress(90);
 
-               //console.log("in feedlist init");
+               console.log("in feedlist init");
                
                hideOrShowFeeds(getInitParam("hide_read_feeds") == 1);
                document.onkeydown = hotkey_handler;
-               document.onmousemove = mouse_move_handler;
-               document.onmousedown = mouse_down_handler;
-               document.onmouseup = mouse_up_handler;
-
-               if (!offline_mode) setTimeout("timeout()", 1);
-
                setTimeout("hotkey_prefix_timeout()", 5*1000);
 
-               if (getActiveFeedId()) {
+                if (getActiveFeedId()) {
                        //console.log("some feed is open on feedlist refresh, reloading");
                        //setTimeout("viewCurrentFeed()", 100);
                } else {
-                       if (getInitParam("cdm_auto_catchup") != 1 && get_feed_unread(-3) > 0) {
-                               notify_silent_next();
+                       if (getInitParam("cdm_auto_catchup") != 1) {
                                setTimeout("viewfeed(-3)", 100);
                        } else {
                                setTimeout("viewfeed(-5)", 100);
                                remove_splash();
                        }
-               }
+               } 
+
+               console.log("T:" + 
+                               getInitParam("cdm_auto_catchup") + " " + get_feed_unread(-3));
 
                if (getInitParam("theme") == "" || 
                                getInitParam("theme_options").match("hide_footer")) {
                        setTimeout("hide_footer()", 5000);
                }
 
-               init_collapsable_feedlist(getInitParam("theme"));
+               //init_collapsable_feedlist(getInitParam("theme"));
 
                toggle_sortable_feedlist(isFeedlistSortable());
 
@@ -461,7 +304,7 @@ function feedlist_init() {
        }
 }
 
-function hide_footer_af(effect) {
+/* function hide_footer_af(effect) {
        try {
                var c = $("content-frame");
 
@@ -485,69 +328,19 @@ function hide_footer_af(effect) {
        } catch (e) {
                exception_error("hide_footer_af", e);
        }
-}
+} */
 
 function hide_footer() {
        try {
-               if (Element.visible("footer")) {
-                       new Effect.Fade("footer", { afterFinish: hide_footer_af });
-               }
-       } catch (e) {
-               exception_error("hide_footer", e);
-       }
-}
+               /* if (Element.visible("footer")) {
 
-function init_collapsable_feedlist() {
-       try {
-               //console.log("init_collapsable_feedlist");
-
-               var theme = getInitParam("theme");
-               var options = getInitParam("theme_options");
-
-               if (theme != "" && !options.match("collapse_feedlist")) return;
-
-               var fbtn = $("collapse_feeds_btn");
-
-               if (fbtn) Element.show(fbtn);
-
-               if (getInitParam("collapsed_feedlist") == 1) {
-                       collapse_feedlist();
-               }
-
-       } catch (e) {
-               exception_error("init_hidden_feedlist", e);
-       }
-
-}
-
-function mouse_move_handler(e) {
-       try {
-               var client_y;
-               var client_x;
-
-               if (window.event) {
-                       client_y = window.event.clientY;
-                       client_x = window.event.clientX;
-               } else if (e) {
-                       client_x = e.screenX;
-                       client_y = e.screenY;
-               }
-
-               if (mouse_is_down) {
-
-                       if (mouse_y == 0) mouse_y = client_y;
-                       if (mouse_x == 0) mouse_x = client_x;
-
-                       resize_headlines(mouse_x - client_x, mouse_y - client_y);
-
-                       mouse_y = client_y;
-                       mouse_x = client_x;
-
-                       return false;
-               }
+                       Element.hide("footer");
+                       dijit.byId("main").resize();
 
+                       //new Effect.Fade("footer", { afterFinish: hide_footer_af });
+               } */
        } catch (e) {
-               exception_error("mouse_move_handler", e);
+               exception_error("hide_footer", e);
        }
 }
 
@@ -559,64 +352,13 @@ function enable_resize(b) {
        resize_enabled = b;
 }
 
-function mouse_down_handler(e) {
-       try {
-
-               /* do not prevent right click */
-               if (e && e.button && e.button == 2) return;
-
-               if (resize_enabled) { 
-                       mouse_is_down = true;
-                       mouse_x = 0;
-                       mouse_y = 0;
-                       document.onselectstart = function() { return false; };
-                       return false;
-               }
-
-               if (selection_disabled) {
-                       document.onselectstart = function() { return false; };
-                       return false;
-               }
-
-       } catch (e) {
-               exception_error("mouse_down_handler", e);
-       }
-}
-
-function mouse_up_handler(e) {
-       try {
-               mouse_is_down = false;
-
-               if (!selection_disabled) {
-                       document.onselectstart = null;
-                       var e = $("headlineActionsBody");
-                       if (e) Element.hide(e);
-                       
-                       var e = $("offlineModeDrop");
-                       if (e) Element.hide(e);
-
-               }
-
-       } catch (e) {
-               exception_error("mouse_up_handler", e);
-       }
-}
-
 function request_counters_real() {
-
        try {
-
-               if (offline_mode) return;
-
                console.log("requesting counters...");
 
                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,
@@ -695,11 +437,6 @@ function parse_counters(reply, scheduled_call) {
                        var xmsg = elems[l].xmsg;
        
                        if (id == "global-unread") {
-
-                               if (ctr > global_unread) {
-                                       offlineDownloadStart(1);
-                               }
-
                                global_unread = ctr;
                                updateTitle();
                                continue;
@@ -709,135 +446,37 @@ function parse_counters(reply, scheduled_call) {
                                feeds_found = ctr;
                                continue;
                        }
-       
-                       if (kind && kind == "cat") {
-                               var catctr = $("FCATCTR-" + id);
-                               if (catctr) {
-                                       catctr.innerHTML = "(" + ctr + ")";
-                                       if (ctr > 0) {
-                                               catctr.className = "catCtrHasUnread";
-                                       } else {
-                                               catctr.className = "catCtrNoUnread";
-                                       }
-                               }
-                               continue;
-                       }
-               
-                       var feedctr = $("FEEDCTR-" + id);
-                       var feedu = $("FEEDU-" + id);
-                       var feedr = $("FEEDR-" + id);
-                       var feed_img = $("FIMG-" + id);
-                       var feedlink = $("FEEDL-" + id);
-                       var feedupd = $("FLUPD-" + id);
-
-                       if (updated && feedlink) {
-                               if (error) {
-                                       feedlink.title = "Error: " + error + " (" + updated + ")";
-                               } else {
-                                       feedlink.title = "Updated: " + updated;
-                               }
-                       }
-
-                       if (feedupd) {
-                               if (!updated) updated = "";
-
-                               if (error) {
-                                       if (xmsg) {
-                                               feedupd.innerHTML = updated + " " + xmsg + " (Error)";
-                                       } else {
-                                               feedupd.innerHTML = updated + " (Error)";
-                                       }
-                               } else {
-                                       if (xmsg) {
-                                               feedupd.innerHTML = updated + " (" + xmsg + ")";
-                                       } else {
-                                               feedupd.innerHTML = updated;
-                                       }
-                               }
-                       }
-
-                       if (has_img && feed_img) {
-                               if (!feed_img.src.match(id + ".ico")) {
-                                       feed_img.src = getInitParam("icons_url") + "/" + id + ".ico";
-                               }
-                       }
-
-                       if (feedlink && title) {
-                               feedlink.innerHTML = title;
-                       }
-
-                       if (feedctr && feedu && feedr) {
-
-//                             if (id == getActiveFeedId())
-//                                     console.log("HAS CTR: " + feedu.innerHTML + " GOT CTR: " + ctr + 
-//                                                     " IS_SCHED: " + scheduled_call);
-
-                               if (parseInt(ctr) > 0 && 
-                                               parseInt(feedu.innerHTML) < parseInt(ctr) && 
-                                               id == getActiveFeedId() && scheduled_call) {
-
-                                       displayNewContentPrompt(id);
-                               }
 
-                               var row_needs_hl = (ctr > 0 && ctr > parseInt(feedu.innerHTML));
+                       var treeItem;
 
-                               feedu.innerHTML = ctr;
+                       setFeedUnread(id, (kind == "cat"), ctr);
 
-                               if (error) {
-                                       feedr.className = feedr.className.replace("feed", "error");
-                               } else if (id > 0) {
-                                       feedr.className = feedr.className.replace("error", "feed");
-                               }
-       
-                               if (ctr > 0) {                                  
-                                       feedctr.className = "feedCtrHasUnread";
-                                       if (!feedr.className.match("Unread")) {
-                                               var is_selected = feedr.className.match("Selected");
-               
-                                               feedr.className = feedr.className.replace("Selected", "");
-                                               feedr.className = feedr.className.replace("Unread", "");
-               
-                                               feedr.className = feedr.className + "Unread";
-               
-                                               if (is_selected) {
-                                                       feedr.className = feedr.className + "Selected";
-                                               }       
-                                               
-                                       }
+                       if (kind != "cat") {
+                               //setFeedValue(id, false, 'error', error);
+                               setFeedValue(id, false, 'updated', updated);
 
-                                       if (row_needs_hl && 
-                                                       !getInitParam("theme_options").match('no_highlights')) { 
-                                               new Effect.Highlight(feedr, {duration: 1, startcolor: "#fff7d5",
-                                                       queue: { position:'end', scope: 'EFQ-' + id, limit: 1 } } );
-
-                                               cache_invalidate("F:" + id);
+                               if (id > 0) {
+                                       if (has_img) {
+                                               setFeedIcon(id, false, 
+                                                       getInitParam("icons_url") + "/" + id + ".ico");
+                                       } else {
+                                               setFeedIcon(id, false, 'images/blank_icon.gif');
                                        }
-                               } else {
-                                       feedctr.className = "feedCtrNoUnread";
-                                       feedr.className = feedr.className.replace("Unread", "");
-                               }                       
+                               }
                        }
                }
-
+       
                hideOrShowFeeds(getInitParam("hide_read_feeds") == 1);
 
                var feeds_stored = number_of_feeds;
 
-               //console.log("Feed counters, C: " + feeds_found + ", S:" + feeds_stored);
-
                if (feeds_stored != feeds_found) {
                        number_of_feeds = feeds_found;
 
                        if (feeds_stored != 0 && feeds_found != 0) {
                                console.log("Subscribed feed number changed, refreshing feedlist");
-                               setTimeout('updateFeedList(false, false)', 50);
+                               setTimeout('updateFeedList()', 50);
                        }
-               } else {
-/*                     var fl = $("feeds-frame").innerHTML;
-                       if (fl) {
-                               cache_invalidate("FEEDLIST");
-                               cache_inject("FEEDLIST", fl, getInitParam("num_feeds"));
-                       } */
                }
 
        } catch (e) {
@@ -845,23 +484,25 @@ function parse_counters(reply, scheduled_call) {
        }
 }
 
-function get_feed_unread(id) {
+function get_feed_unread(feed, is_cat) {
        try {
-               return parseInt($("FEEDU-" + id).innerHTML);    
+               if (is_cat) 
+                       treeItem = treeModel.store._itemsByIdentity['CAT:' + feed];
+               else
+                       treeItem = treeModel.store._itemsByIdentity['FEED:' + feed];
+
+               if (treeItem)
+                       return treeModel.store.getValue(treeItem, 'unread');
+
        } catch (e) {
-               return -1;
+               //
        }
+
+       return -1;
 }
 
 function get_cat_unread(id) {
-       try {
-               var ctr = $("FCATCTR-" + id).innerHTML;
-               ctr = ctr.replace("(", "");
-               ctr = ctr.replace(")", "");
-               return parseInt(ctr);
-       } catch (e) {
-               return -1;
-       }
+       return get_feed_unread(id, true);
 }
 
 function get_feed_entry_unread(elem) {
@@ -889,21 +530,23 @@ function resort_category(node, cat_mode) {
 
        try {
 
-               console.log("resort_category: " + node + " CM=" + cat_mode);
+               //console.log("resort_category: " + node + " CM=" + cat_mode);
        
                var by_unread = feedsSortByUnread();
        
                var list = node.getElementsByTagName("LI");
-       
+
                for (i = 0; i < list.length; i++) {
        
                        for (j = i+1; j < list.length; j++) {                   
        
                                var tmp_val = get_feed_entry_unread(list[i]);
                                var cur_val = get_feed_entry_unread(list[j]);
+                               
+                               //console.log(list[i].id + " vs " + list[j].id);
        
-                               var tmp_name = get_feed_entry_name(list[i]);
-                               var cur_name = get_feed_entry_name(list[j]);
+                               var tmp_name = get_feed_entry_name(list[i]).toLowerCase();
+                               var cur_name = get_feed_entry_name(list[j]).toLowerCase();
 
                                /* we don't want to match FEEDR-0 - e.g. Archived articles */
 
@@ -926,17 +569,17 @@ function resort_category(node, cat_mode) {
 }
 
 function resort_feedlist() {
+       return;
+
        console.log("resort_feedlist");
 
        if ($("FCATLIST--1")) {
 
-               var lists = document.getElementsByTagName("UL");
+               var lists = $$("#feedList ul[id*=FCATLIST]");
 
-               for (var i = 0; i < lists.length; i++) {
-                       if (lists[i].id && lists[i].id.match("FCATLIST-")) {
-                               resort_category(lists[i], true);
-                       }
-               }
+               lists.each(function(list) {
+                               if (list.id != "FCATLIST--1") resort_category(list, true);
+                       });
 
        } else {
                resort_category($("feedList"), false);
@@ -944,170 +587,169 @@ function resort_feedlist() {
 }
 
 function hideOrShowFeeds(hide) {
+       var tree = dijit.byId("feedTree");
 
-       try {
-
-       //console.log("hideOrShowFeeds: " + hide);
-
-       if ($("FCATLIST--1")) {
+       if (!tree) return;
 
-               var lists = document.getElementsByTagName("UL");
+       if (getInitParam("enable_feed_cats")) {
 
-               for (var i = 0; i < lists.length; i++) {
-                       if (lists[i].id && lists[i].id.match("FCATLIST-")) {
+               var cats = tree.model.store._arrayOfTopLevelItems;
 
-                               var id = lists[i].id.replace("FCATLIST-", "");
-                               hideOrShowFeedsCategory(id, hide);
+               cats.each(function(cat) {
+                       var cat_unread = hideOrShowFeedsCategory(cat.items, hide);
+       
+                       var id = String(cat.id);
+                       var node = tree._itemNodesMap[id];
+       
+                       if (node) {
+                               if (hide && cat_unread == 0) {
+                                       Effect.Fade(node[0].rowNode, {duration : 0.3, 
+                                               queue: { position: 'end', scope: 'FFADE-' + id, limit: 1 }});
+                               } else {
+                                       Element.show(node[0].rowNode);
+                                       ++cat_unread;
+                               }
                        }
-               }
+       
+               });
 
        } else {
-               hideOrShowFeedsCategory(null, hide);
+               hideOrShowFeedsCategory(tree.model.store._arrayOfTopLevelItems, hide);
        }
 
+/*     try {
+
+               if ($("FCATLIST--1")) {
+       
+                       var lists = $$("#feedList ul[id*=FCATLIST]");
+       
+                       lists.each(function(list) {
+                                       hideOrShowFeedsCategory(list.id.replace("FCATLIST-", ""), hide);
+                               });
+       
+               } else {
+                       hideOrShowFeedsCategory(null, hide);
+               }
+
        } catch (e) {
                exception_error("hideOrShowFeeds", e);
-       }
+       } */
 }
 
-function hideOrShowFeedsCategory(id, hide) {
-
+function hideOrShowFeedsCategory(feeds, hide) {
        try {
-       
-               var node = null;
-               var cat_node = null;
+               //console.warn("hideOrShowFeedsCategory: function not implemented");
+       var tree = dijit.byId("feedTree");
+
+       if (!tree) return;
 
-               if (id) {
-                       node = $("FCATLIST-" + id);
-                       cat_node = $("FCAT-" + id);
+       var cat_unread = 0;
+
+       feeds.each(function(feed) {
+               var id = String(feed.id);
+               var bare_id = parseInt(id.substr(id.indexOf(":")+1));
+
+               var unread = feed.unread[0];
+               var node = tree._itemNodesMap[id];
+
+               if (node) {
+                       if (hide && unread == 0 && (bare_id > 0 || !getInitParam("hide_read_shows_special"))) {
+                               Effect.Fade(node[0].rowNode, {duration : 0.3, 
+                                       queue: { position: 'end', scope: 'FFADE-' + id, limit: 1 }});
+                       } else {
+                               Element.show(node[0].rowNode);
+                               ++cat_unread;
+                       }
+               }
+       });
+
+       return cat_unread;
+
+/*             var nodes;
+               var cat_node;
+               
+               if (cat_id) {
+                       nodes = $$("#FCATLIST-" + cat_id + " > li");
+                       cat_node = $("FCAT-" + cat_id);
                } else {
-                       node = $("feedList"); // no categories
+                       nodes = $$("#feedList li");
                }
 
-       //      console.log("hideOrShowFeedsCategory: " + node + " (" + hide + ")");
-       
                var cat_unread = 0;
-       
-               if (!node) {
-                       console.warn("hideOrShowFeeds: passed node is null, aborting");
-                       return;
-               }
-       
-       //      console.log("cat: " + node.id);
-       
-               if (node.hasChildNodes() && node.firstChild.nextSibling != false) {  
-                       for (i = 0; i < node.childNodes.length; i++) {
-                               if (node.childNodes[i].nodeName != "LI") { continue; }
-       
-                               if (node.childNodes[i].style != undefined) {
-       
-                                       var has_unread = (node.childNodes[i].className != "feed" &&
-                                               node.childNodes[i].className != "label" && 
-                                               !(!getInitParam("hide_read_shows_special") && 
-                                                       node.childNodes[i].className == "virt") && 
-                                               node.childNodes[i].className != "error" && 
-                                               node.childNodes[i].className != "tag");
-
-                                       var has_error = node.childNodes[i].className.match("error");
-               
-       //                              console.log(node.childNodes[i].id + " --> " + has_unread);
-               
-                                       if (hide && !has_unread) {
-                                               var id = node.childNodes[i].id;
-                                               Effect.Fade(node.childNodes[i], {duration : 0.3, 
-                                                       queue: { position: 'end', scope: 'FFADE-' + id, limit: 1 }});
-                                       }
-               
-                                       if (!hide) {
-                                               Element.show(node.childNodes[i]);
-                                       }
-               
-                                       if (has_unread) {
-                                               Element.show(node.childNodes[i]);
-                                               cat_unread++;
-                                       }
 
-                                       //if (has_error)        Element.hide(node.childNodes[i]);
-                               }
-                       }
-               }       
-       
-       //      console.log("end cat: " + node.id + " unread " + cat_unread);
+               nodes.each(function(node) {
 
-               if (cat_node) {
+                       var is_unread = node.hasClassName("Unread") ||
+                               node.hasClassName("Selected") || 
+                               (node.hasClassName("virt") && 
+                                       getInitParam("hide_read_shows_special"));
 
-                       if (cat_unread == 0) {
-                               if (cat_node.style == undefined) {
-                                       console.log("ERROR: supplied cat_node " + cat_node + 
-                                               " has no styles. WTF?");
-                                       return;
-                               }
-                               if (hide) {
-                                       //cat_node.style.display = "none";
-                                       Effect.Fade(cat_node, {duration : 0.3, 
-                                               queue: { position: 'end', scope: 'CFADE-' + node.id, limit: 1 }});
-                               } else {
-                                       cat_node.style.display = "list-item";
-                               }
+                       if (hide && !is_unread) {
+                               Effect.Fade(node, {duration : 0.3, 
+                                       queue: { position: 'end', scope: 'FFADE-' + node.id, limit: 1 }});
                        } else {
-                               try {
-                                       cat_node.style.display = "list-item";
-                               } catch (e) {
-                                       console.log(e);
-                               }
+                               Element.show(node);
+                               ++cat_unread;
                        }
-               }
 
-//     console.log("unread for category: " + cat_unread);
+               });
+
+               if (cat_node) {
+                       if (hide && cat_unread == 0 && !cat_node.hasClassName("Selected")) {
+                               Effect.Fade(cat_node, {duration : 0.3, 
+                                       queue: { position: 'end', scope: 'CFADE-' + cat_node.id, limit: 1 }});
+                       } else {
+                               Element.show(cat_node);
+                       }
+               } */
 
        } catch (e) {
                exception_error("hideOrShowFeedsCategory", e);
        }
 }
 
-function getFeedName(id, is_cat) {     
-       var e;
+function getFeedName(feed, is_cat) {   
+       return getFeedValue(feed, is_cat, 'name');
+}
+
+function getFeedValue(feed, is_cat, key) {     
 
-       if (is_cat) {
-               e = $("FCATN-" + id);
-       } else {
-               e = $("FEEDN-" + id);
-       }
-       if (e) {
-               return e.innerHTML.stripTags();
-       } else {
-               return null;
+       try {
+               if (is_cat) 
+                       treeItem = treeModel.store._itemsByIdentity['CAT:' + feed];
+               else
+                       treeItem = treeModel.store._itemsByIdentity['FEED:' + feed];
+
+               if (treeItem)
+                       return treeModel.store.getValue(treeItem, key);
+
+       } catch (e) {
+               //
        }
+
+       return '';
 }
 
 function getNextUnreadCat(id) {
        try {
-               var rows = $("feedList").getElementsByTagName("LI");
-               var feeds = new Array();
-
-               var unread_only = true;
-               var is_cat = true;
+               var rows = $$("#feedList li[id*=FCAT]");
+               var unread_cats = [];
 
-               for (var i = 0; i < rows.length; i++) {
-                       if (rows[i].id.match("FCAT-")) {
-                               if (rows[i].id == "FCAT-" + id && is_cat || (Element.visible(rows[i]) && Element.visible(rows[i].parentNode))) {
+               rows.each(function(row) {
+                       var cat_id = row.id.replace("FCAT-", "");
 
-                                       var cat_id = parseInt(rows[i].id.replace("FCAT-", ""));
+                       if (Element.visible(row) && get_cat_unread(cat_id) > 0)
+                               unread_cats.push(parseInt(cat_id));
+                       });
 
-                                       if (cat_id >= 0) {
-                                               if (!unread_only || get_cat_unread(cat_id) > 0) {
-                                                       feeds.push(cat_id);
-                                               }
-                                       }
-                               }
-                       }
-               }
+               console.log(unread_cats);
+               
+               var idx = unread_cats.indexOf(id);
 
-               var idx = feeds.indexOf(id);
-               if (idx != -1 && idx < feeds.length) {
-                       return feeds[idx+1];                                    
+               if (idx != -1 && idx < unread_cats.length-1) {
+                       return unread_cats[idx+1];                                      
                } else {
-                       return feeds.shift();
+                       return unread_cats[0];
                }
 
        } catch (e) {
@@ -1120,7 +762,7 @@ function getRelativeFeedId2(id, is_cat, direction, unread_only) {
 
 //             alert(id + " IC: " + is_cat + " D: " + direction + " U: " + unread_only);
 
-               var rows = $("feedList").getElementsByTagName("LI");
+               var rows = $$("#feedList li");
                var feeds = new Array();
        
                for (var i = 0; i < rows.length; i++) {
@@ -1129,7 +771,7 @@ function getRelativeFeedId2(id, is_cat, direction, unread_only) {
                                if (rows[i].id == "FEEDR-" + id && !is_cat || (Element.visible(rows[i]) && Element.visible(rows[i].parentNode))) {
        
                                        if (!unread_only || 
-                                                       (rows[i].className.match("Unread") || rows[i].id == "FEEDR-" + id)) {
+                                                       (rows[i].hasClassName("Unread") || rows[i].id == "FEEDR-" + id)) {
                                                feeds.push(rows[i].id.replace("FEEDR-", ""));
                                        }
                                }
@@ -1183,25 +825,100 @@ function getRelativeFeedId2(id, is_cat, direction, unread_only) {
        }
 }
 
-function clean_feed_selections() {
+function feedsSortByUnread() {
+       return feeds_sort_by_unread;
+}
+
+function setFeedUnread(feed, is_cat, unread) {
        try {
-               var feeds = $("feedList").getElementsByTagName("LI");
-
-               for (var i = 0; i < feeds.length; i++) {
-                       if (feeds[i].id && feeds[i].id.match("FEEDR-")) {
-                               feeds[i].className = feeds[i].className.replace("Selected", "");
-                       }                       
-                       if (feeds[i].id && feeds[i].id.match("FCAT-")) {
-                               feeds[i].className = feeds[i].className.replace("Selected", "");
-                       }
+               setFeedValue(feed, is_cat, 'unread', parseInt(unread));
+       } catch (e) {
+               exception_error("setFeedUnread", e);
+       }
+}
+
+function setFeedValue(feed, is_cat, key, value) {
+       try {
+               if (!value) value = '';
+               if (!treeModel) return;
+
+               if (is_cat) 
+                       treeItem = treeModel.store._itemsByIdentity['CAT:' + feed];
+               else
+                       treeItem = treeModel.store._itemsByIdentity['FEED:' + feed];
+
+               if (treeItem)
+                       treeModel.store.setValue(treeItem, key, value);
+
+       } catch (e) {
+               exception_error("setFeedValue", e);
+       }
+}
+
+function toggleCollapseCat(id) {
+       console.warn("toggleCollapseCat: function not implemented");
+}
+
+function selectFeed(feed, is_cat) {
+       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];
+                       if (!is_cat) tree._expandNode(treeNode);
+                       tree._selectNode(treeNode);
                }
+
        } catch (e) {
-               exception_error("clean_feed_selections", e);
+               exception_error("selectFeed", e);
        }
 }
 
-function feedsSortByUnread() {
-       return feeds_sort_by_unread;
+function setFeedIcon(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.iconNode.src = src;
+               }
+
+       } catch (e) {
+               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);
+       }
+}