]> git.wh0rd.org - tt-rss.git/blobdiff - feedlist.js
code cleanup
[tt-rss.git] / feedlist.js
index b7d47b4a59763f8f9e480cea4bd6f2dfc1e28df0..071887a1b5cbaf40cef170fe30df1aa266589089 100644 (file)
@@ -3,18 +3,17 @@ 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;
 var selection_disabled = false;
 var counters_last_request = 0;
 
+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"});
@@ -24,7 +23,7 @@ function toggle_sortable_feedlist(enabled) {
 
        } catch (e) {
                exception_error("toggle_sortable_feedlist", e);
-       }
+       } */
 }
 
 function viewCategory(cat) {
@@ -32,28 +31,13 @@ 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;
 
                console.log("viewNextFeedPage: calling viewfeed(), p: " + parseInt(_feed_cur_page+1));
 
-               viewfeed(getActiveFeedId(), undefined, activeFeedIsCat(), undefined,
-                       undefined, parseInt(_feed_cur_page+1));
+               viewfeed(getActiveFeedId(), '', activeFeedIsCat(), parseInt(_feed_cur_page+1));
 
        } catch (e) {
                exception_error("viewNextFeedPage", e);
@@ -61,11 +45,9 @@ function viewNextFeedPage() {
 }
 
 
-function viewfeed(feed, subop, is_cat, subop_param, skip_history, offset) {
+function viewfeed(feed, subop, is_cat, offset) {
        try {
-
-               if (offline_mode) return viewfeed_offline(feed, subop, is_cat, subop_param,
-                       skip_history, offset);
+               if (is_cat == undefined) is_cat = false;
 
 //             if (!offset) page_offset = 0;
 
@@ -145,8 +127,6 @@ function viewfeed(feed, subop, is_cat, subop_param, skip_history, 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) {
@@ -208,23 +188,10 @@ function viewfeed(feed, subop, is_cat, subop_param, skip_history, 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");
 
-/*             if (container && page_offset == 0 && !isCdmMode()) {
-                       new Effect.Fade(container, {duration: 1, to: 0.01,
-                               queue: { position:'end', scope: 'FEEDL-' + feed, limit: 1 } } );
-               } */
-
                var unread_ctr = -1;
                
                if (!is_cat) unread_ctr = get_feed_unread(feed);
@@ -246,69 +213,24 @@ function viewfeed(feed, subop, is_cat, subop_param, skip_history, 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) {
-
-                                               if (!img.src.match("indicator_white")) {
-                                                       img.alt = img.src;
-                                                       img.src = getInitParam("sign_progress");
-                                               }
-
-                                       } 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); 
                                } });
                }
@@ -318,68 +240,22 @@ function viewfeed(feed, subop, is_cat, subop_param, skip_history, 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 });
-
-               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 feedlist_dragsorted(ctr) {
        try {
-               var elem = $("feedList");
+               var cats = $$("#feedList > li[id*=FCAT-]");
+               var ordered_cats = [];
 
-               var cats = elem.getElementsByTagName("LI");
-               var ordered_cats = new Array();
-
-               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) {
 
                        var query = "?op=feeds&subop=catsort&corder=" + 
                                param_escape(ordered_cats.toString());
 
-                       console.log(query);
+                       //console.log(query);
 
                        new Ajax.Request("backend.php", { parameters: query });
                }
@@ -397,33 +273,29 @@ function 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());
 
@@ -432,7 +304,7 @@ function feedlist_init() {
        }
 }
 
-function hide_footer_af(effect) {
+/* function hide_footer_af(effect) {
        try {
                var c = $("content-frame");
 
@@ -456,178 +328,597 @@ 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 });
-               }
+               /* if (Element.visible("footer")) {
+
+                       Element.hide("footer");
+                       dijit.byId("main").resize();
+
+                       //new Effect.Fade("footer", { afterFinish: hide_footer_af });
+               } */
        } catch (e) {
                exception_error("hide_footer", e);
        }
 }
 
-function init_collapsable_feedlist() {
+function enable_selection(b) {
+       selection_disabled = !b;
+}
+
+function enable_resize(b) {
+       resize_enabled = b;
+}
+
+function request_counters_real() {
        try {
-               console.log("init_collapsable_feedlist");
+               console.log("requesting counters...");
 
-               var theme = getInitParam("theme");
-               var options = getInitParam("theme_options");
+               var query = "?op=rpc&subop=getAllCounters&seq=" + next_seq();
 
-               if (theme != "" && !options.match("collapse_feedlist")) return;
+               query = query + "&omode=flc";
 
-               var fbtn = $("collapse_feeds_btn");
+               new Ajax.Request("backend.php", {
+                       parameters: query,
+                       onComplete: function(transport) { 
+                               try {
+                                       handle_rpc_reply(transport);
+                               } catch (e) {
+                                       exception_error("viewfeed/getcounters", e);
+                               }
+                       } });
 
-               if (fbtn) Element.show(fbtn);
+       } catch (e) {
+               exception_error("request_counters_real", e);
+       }
+}
+
+
+function request_counters() {
 
-               if (getInitParam("collapsed_feedlist") == 1) {
-                       collapse_feedlist();
+       try {
+
+               if (getInitParam("bw_limit") == "1") return;
+
+               var date = new Date();
+               var timestamp = Math.round(date.getTime() / 1000);
+
+               if (timestamp - counters_last_request > 5) {
+                       console.log("scheduling request of counters...");
+
+                       window.clearTimeout(counter_timeout_id);
+                       counter_timeout_id = window.setTimeout("request_counters_real()", 1000);
+
+                       counters_last_request = timestamp;
+               } else {
+                       console.log("request_counters: rate limit reached: " + (timestamp - counters_last_request));
                }
 
        } catch (e) {
-               exception_error("init_hidden_feedlist", e);
+               exception_error("request_counters", e);
        }
+}
+
+function displayNewContentPrompt(id) {
+       try {
+
+               var msg = "<a href='#' onclick='viewfeed("+id+")'>" +
+                       __("New articles available in this feed (click to show)") + "</a>";
 
+               msg = msg.replace("%s", getFeedName(id));
+
+               $('auxDlg').innerHTML = msg;
+
+               new Effect.Appear('auxDlg', {duration : 0.5});
+
+       } catch (e) {
+               exception_error("displayNewContentPrompt", e);
+       }
 }
 
-function mouse_move_handler(e) {
+function parse_counters(reply, scheduled_call) {
        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) {
+               var feeds_found = 0;
+
+               var elems = JSON.parse(reply.firstChild.nodeValue);
+
+               for (var l = 0; l < elems.length; l++) {
+
+                       var id = elems[l].id
+                       var kind = elems[l].kind;
+                       var ctr = parseInt(elems[l].counter)
+                       var error = elems[l].error;
+                       var has_img = elems[l].has_img;
+                       var updated = elems[l].updated;
+                       var title = elems[l].title;
+                       var xmsg = elems[l].xmsg;
+       
+                       if (id == "global-unread") {
+                               global_unread = ctr;
+                               updateTitle();
+                               continue;
+                       }
+
+                       if (id == "subscribed-feeds") {
+                               feeds_found = ctr;
+                               continue;
+                       }
+
+                       var treeItem;
+
+                       setFeedUnread(id, (kind == "cat"), ctr);
 
-                       if (mouse_y == 0) mouse_y = client_y;
-                       if (mouse_x == 0) mouse_x = client_x;
+                       if (kind != "cat") {
+                               //setFeedValue(id, false, 'error', error);
+                               setFeedValue(id, false, 'updated', updated);
 
-                       resize_headlines(mouse_x - client_x, mouse_y - client_y);
+                               if (id > 0) {
+                                       if (has_img) {
+                                               setFeedIcon(id, false, 
+                                                       getInitParam("icons_url") + "/" + id + ".ico");
+                                       } else {
+                                               setFeedIcon(id, false, 'images/blank_icon.gif');
+                                       }
+                               }
+                       }
+               }
+       
+               hideOrShowFeeds(getInitParam("hide_read_feeds") == 1);
+
+               var feeds_stored = number_of_feeds;
 
-                       mouse_y = client_y;
-                       mouse_x = client_x;
+               if (feeds_stored != feeds_found) {
+                       number_of_feeds = feeds_found;
 
-                       return false;
+                       if (feeds_stored != 0 && feeds_found != 0) {
+                               console.log("Subscribed feed number changed, refreshing feedlist");
+                               setTimeout('updateFeedList()', 50);
+                       }
                }
 
        } catch (e) {
-               exception_error("mouse_move_handler", e);
+               exception_error("parse_counters", e);
        }
 }
 
-function enable_selection(b) {
-       selection_disabled = !b;
+function get_feed_unread(feed, is_cat) {
+       try {
+               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;
 }
 
-function enable_resize(b) {
-       resize_enabled = b;
+function get_cat_unread(id) {
+       return get_feed_unread(id, true);
 }
 
-function mouse_down_handler(e) {
+function get_feed_entry_unread(elem) {
+
+       var id = elem.id.replace("FEEDR-", "");
+
+       if (id <= 0) {
+               return -1;
+       }
+
        try {
+               return parseInt($("FEEDU-" + id).innerHTML);    
+       } catch (e) {
+               return -1;
+       }
+}
 
-               /* do not prevent right click */
-               if (e && e.button && e.button == 2) return;
+function get_feed_entry_name(elem) {
+       var id = elem.id.replace("FEEDR-", "");
+       return getFeedName(id);
+}
 
-               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;
+function resort_category(node, cat_mode) {
+
+       try {
+
+               //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]).toLowerCase();
+                               var cur_name = get_feed_entry_name(list[j]).toLowerCase();
+
+                               /* we don't want to match FEEDR-0 - e.g. Archived articles */
+
+                               var valid_pair = cat_mode || (list[i].id.match(/FEEDR-[1-9]/) &&
+                                               list[j].id.match(/FEEDR-[1-9]/));
+
+                               if (valid_pair && ((by_unread && (cur_val > tmp_val)) || (!by_unread && (cur_name < tmp_name)))) {
+                                       tempnode_i = list[i].cloneNode(true);
+                                       tempnode_j = list[j].cloneNode(true);
+                                       node.replaceChild(tempnode_i, list[j]);
+                                       node.replaceChild(tempnode_j, list[i]);
+                               }
+                       }
                }
 
        } catch (e) {
-               exception_error("mouse_down_handler", e);
+               exception_error("resort_category", e);
        }
+
 }
 
-function mouse_up_handler(e) {
+function resort_feedlist() {
+       return;
+
+       console.log("resort_feedlist");
+
+       if ($("FCATLIST--1")) {
+
+               var lists = $$("#feedList ul[id*=FCATLIST]");
+
+               lists.each(function(list) {
+                               if (list.id != "FCATLIST--1") resort_category(list, true);
+                       });
+
+       } else {
+               resort_category($("feedList"), false);
+       }
+}
+
+function hideOrShowFeeds(hide) {
+       var tree = dijit.byId("feedTree");
+
+       if (!tree) return;
+
+       if (getInitParam("enable_feed_cats")) {
+
+               var cats = tree.model.store._arrayOfTopLevelItems;
+
+               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(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(feeds, hide) {
        try {
-               mouse_is_down = false;
+               //console.warn("hideOrShowFeedsCategory: function not implemented");
+       var tree = dijit.byId("feedTree");
+
+       if (!tree) return;
+
+       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;
+                       }
+               }
+       });
 
-               if (!selection_disabled) {
-                       document.onselectstart = null;
-                       var e = $("headlineActionsBody");
-                       if (e) Element.hide(e);
-                       
-                       var e = $("offlineModeDrop");
-                       if (e) Element.hide(e);
+       return cat_unread;
 
+/*             var nodes;
+               var cat_node;
+               
+               if (cat_id) {
+                       nodes = $$("#FCATLIST-" + cat_id + " > li");
+                       cat_node = $("FCAT-" + cat_id);
+               } else {
+                       nodes = $$("#feedList li");
                }
 
+               var cat_unread = 0;
+
+               nodes.each(function(node) {
+
+                       var is_unread = node.hasClassName("Unread") ||
+                               node.hasClassName("Selected") || 
+                               (node.hasClassName("virt") && 
+                                       getInitParam("hide_read_shows_special"));
+
+                       if (hide && !is_unread) {
+                               Effect.Fade(node, {duration : 0.3, 
+                                       queue: { position: 'end', scope: 'FFADE-' + node.id, limit: 1 }});
+                       } else {
+                               Element.show(node);
+                               ++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("mouse_up_handler", e);
+               exception_error("hideOrShowFeedsCategory", e);
        }
 }
 
-function request_counters_real() {
+function getFeedName(feed, is_cat) {   
+       return getFeedValue(feed, is_cat, 'name');
+}
+
+function getFeedValue(feed, is_cat, key) {     
 
        try {
+               if (is_cat) 
+                       treeItem = treeModel.store._itemsByIdentity['CAT:' + feed];
+               else
+                       treeItem = treeModel.store._itemsByIdentity['FEED:' + feed];
 
-               if (offline_mode) return;
+               if (treeItem)
+                       return treeModel.store.getValue(treeItem, key);
 
-               console.log("requesting counters...");
+       } catch (e) {
+               //
+       }
+
+       return '';
+}
+
+function getNextUnreadCat(id) {
+       try {
+               var rows = $$("#feedList li[id*=FCAT]");
+               var unread_cats = [];
 
-               var query = "?op=rpc&subop=getAllCounters";
+               rows.each(function(row) {
+                       var cat_id = row.id.replace("FCAT-", "");
 
-               if (tagsAreDisplayed()) {
-                       query = query + "&omode=tl";
+                       if (Element.visible(row) && get_cat_unread(cat_id) > 0)
+                               unread_cats.push(parseInt(cat_id));
+                       });
+
+               console.log(unread_cats);
+               
+               var idx = unread_cats.indexOf(id);
+
+               if (idx != -1 && idx < unread_cats.length-1) {
+                       return unread_cats[idx+1];                                      
                } else {
-                       query = query + "&omode=flc";
+                       return unread_cats[0];
                }
 
-               new Ajax.Request("backend.php", {
-                       parameters: query,
-                       onComplete: function(transport) { 
-                               try {
-                                       all_counters_callback2(transport);
-                               } catch (e) {
-                                       exception_error("viewfeed/getcounters", e);
+       } catch (e) {
+               exception_error("getNextUnreadCat", e);
+       }
+}
+
+function getRelativeFeedId2(id, is_cat, direction, unread_only) {      
+       try {
+
+//             alert(id + " IC: " + is_cat + " D: " + direction + " U: " + unread_only);
+
+               var rows = $$("#feedList li");
+               var feeds = new Array();
+       
+               for (var i = 0; i < rows.length; i++) {
+                       if (rows[i].id.match("FEEDR-")) {
+       
+                               if (rows[i].id == "FEEDR-" + id && !is_cat || (Element.visible(rows[i]) && Element.visible(rows[i].parentNode))) {
+       
+                                       if (!unread_only || 
+                                                       (rows[i].hasClassName("Unread") || rows[i].id == "FEEDR-" + id)) {
+                                               feeds.push(rows[i].id.replace("FEEDR-", ""));
+                                       }
                                }
-                       } });
+                       }
+
+                       if (rows[i].id.match("FCAT-")) {
+                               if (rows[i].id == "FCAT-" + id && is_cat || (Element.visible(rows[i]) && Element.visible(rows[i].parentNode))) {
+
+                                       var cat_id = parseInt(rows[i].id.replace("FCAT-", ""));
+
+                                       if (cat_id >= 0) {
+                                               if (!unread_only || get_cat_unread(cat_id) > 0) {
+                                                       feeds.push("CAT:"+cat_id);
+                                               }
+                                       }
+                               }
+                       }
+               }
+       
+//             alert(feeds.toString());
+
+               if (!id) {
+                       if (direction == "next") {
+                               return feeds.shift();
+                       } else {
+                               return feeds.pop();
+                       }
+               } else {
+                       if (direction == "next") {
+                               if (is_cat) id = "CAT:" + id;
+                               var idx = feeds.indexOf(id);
+                               if (idx != -1 && idx < feeds.length) {
+                                       return feeds[idx+1];                                    
+                               } else {
+                                       return getRelativeFeedId2(false, is_cat, direction, unread_only);
+                               }
+                       } else {
+                               if (is_cat) id = "CAT:" + id;
+                               var idx = feeds.indexOf(id);
+                               if (idx > 0) {
+                                       return feeds[idx-1];
+                               } else {
+                                       return getRelativeFeedId2(false, is_cat, direction, unread_only);
+                               }
+                       }
+       
+               }
 
        } catch (e) {
-               exception_error("request_counters_real", e);
+               exception_error("getRelativeFeedId2", e);
        }
 }
 
+function feedsSortByUnread() {
+       return feeds_sort_by_unread;
+}
 
-function request_counters() {
+function setFeedUnread(feed, is_cat, unread) {
+       try {
+               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 (getInitParam("bw_limit") == "1") return;
+               if (is_cat) 
+                       treeItem = treeModel.store._itemsByIdentity['CAT:' + feed];
+               else
+                       treeItem = treeModel.store._itemsByIdentity['FEED:' + feed];
 
-               var date = new Date();
-               var timestamp = Math.round(date.getTime() / 1000);
+               if (treeItem)
+                       treeModel.store.setValue(treeItem, key, value);
 
-               if (timestamp - counters_last_request > 10) {
-                       console.log("scheduling request of counters...");
+       } catch (e) {
+               exception_error("setFeedValue", e);
+       }
+}
 
-                       window.clearTimeout(counter_timeout_id);
-                       counter_timeout_id = window.setTimeout("request_counters_real()", 1000);
+function toggleCollapseCat(id) {
+       console.warn("toggleCollapseCat: function not implemented");
+}
 
-                       counters_last_request = timestamp;
-               } else {
-                       console.log("request_counters: rate limit reached: " + (timestamp - counters_last_request));
+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("request_counters", e);
+               exception_error("selectFeed", e);
+       }
+}
+
+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);
+       }
+}