]> git.wh0rd.org - tt-rss.git/blobdiff - feedlist.js
misc typo fixes
[tt-rss.git] / feedlist.js
index f906c37ed367f8a34f548589cc52f5621830e142..c117b66e9b1b878d34861bea2692c5358d7afcfb 100644 (file)
@@ -1,43 +1,46 @@
-var _feed_cur_page = 0;
 var _infscroll_disable = 0;
 var _infscroll_request_sent = 0;
-var feed_under_pointer = undefined;
+var _search_query = false;
 
 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 {
-
-               if (enabled) {
-                       Sortable.create('feedList', {onChange: feedlist_dragsorted, only: "feedCat"});
-               } else {
-                       Sortable.destroy('feedList');
-               }
-
-       } catch (e) {
-               exception_error("toggle_sortable_feedlist", e);
-       } */
-}
-
 function viewCategory(cat) {
        viewfeed(cat, '', true);
        return false;
 }
 
-function viewNextFeedPage() {
+function loadMoreHeadlines() {
        try {
-               //if (!getActiveFeedId()) return;
-
-               console.log("viewNextFeedPage: calling viewfeed(), p: " + parseInt(_feed_cur_page+1));
+               console.log("loadMoreHeadlines");
+
+               var offset = 0;
+
+               var view_mode = document.forms["main_toolbar_form"].view_mode.value;
+               var num_unread = $$("#headlines-frame > div[id*=RROW][class*=Unread]").length;
+               var num_all = $$("#headlines-frame > div[id*=RROW]").length;
+
+               // TODO implement marked & published
+
+               if (view_mode == "marked") {
+                       console.warn("loadMoreHeadlines: marked is not implemented, falling back.");
+                       offset = num_all;
+               } else if (view_mode == "published") {
+                       console.warn("loadMoreHeadlines: published is not implemented, falling back.");
+                       offset = num_all;
+               } else if (view_mode == "unread") {
+                       offset = num_unread;
+               } else if (view_mode == "adaptive") {
+                       if (num_unread > 0)
+                               offset = num_unread;
+                       else
+                               offset = num_all;
+               } else {
+                       offset = num_all;
+               }
 
-               viewfeed(getActiveFeedId(), '', activeFeedIsCat(), parseInt(_feed_cur_page+1));
+               viewfeed(getActiveFeedId(), '', activeFeedIsCat(), offset, false, true);
 
        } catch (e) {
                exception_error("viewNextFeedPage", e);
@@ -45,378 +48,213 @@ function viewNextFeedPage() {
 }
 
 
-function viewfeed(feed, subop, is_cat, offset) {
+function viewfeed(feed, subop, is_cat, offset, background, infscrol_req) {
        try {
-               if (is_cat == undefined) is_cat = false;
+               if (is_cat == undefined)
+                       is_cat = false;
+               else
+                       is_cat = !!is_cat;
 
-//             if (!offset) page_offset = 0;
+               if (subop == undefined) subop = '';
+               if (offset == undefined) offset = 0;
+               if (background == undefined) background = false;
+               if (infscrol_req == undefined) infscrol_req = false;
 
                last_requested_article = 0;
-               //counters_last_request = 0;
-
-               if (feed == getActiveFeedId()) {
-                       cache_invalidate("F:" + feed);
-               }
-
-/*             if (getInitParam("theme") == "" || getInitParam("theme") == "compact") {
-                       if (getInitParam("hide_feedlist") == 1) {
-                               Element.hide("feeds-holder");
-                       }               
-               } */
-
-               var force_nocache = false;
 
-               var page_offset = 0;
+               var cached_headlines = false;
 
-               if (offset > 0) {
-                       page_offset = offset;
+               if (feed == getActiveFeedId()) {
+                       cache_delete("feed:" + feed + ":" + is_cat);
                } else {
-                       page_offset = 0;
-                       _feed_cur_page = 0;
-                       _infscroll_disable = 0;
-               }
+                       cached_headlines = cache_get("feed:" + feed + ":" + is_cat);
 
-               if (getActiveFeedId() != feed) {
-                       _feed_cur_page = 0;
-                       active_post_id = 0;
-                       _infscroll_disable = 0;
-               }
+                       // switching to a different feed, we might as well catchup stuff visible
+                       // in headlines buffer (if any)
+                       if (!background && getInitParam("cdm_auto_catchup") == 1 && parseInt(getActiveFeedId()) > 0) {
 
-               if (page_offset != 0 && !subop) {
-                       var date = new Date();
-                       var timestamp = Math.round(date.getTime() / 1000);
+                               $$("#headlines-frame > div[id*=RROW][class*=Unread]").each(
+                                       function(child) {
+                                               var hf = $("headlines-frame");
 
-                       console.log(_infscroll_request_sent + " : " + timestamp);
+                                               if (hf.scrollTop + hf.offsetHeight >=
+                                                               child.offsetTop + child.offsetHeight) {
 
-                       if (_infscroll_request_sent && _infscroll_request_sent + 30 > timestamp) {
-                               console.log("infscroll request in progress, aborting");
-                               return;
-                       }
+                                                       var id = child.id.replace("RROW-", "");
 
-                       _infscroll_request_sent = timestamp;                    
-               }
+                                                       if (catchup_id_batch.indexOf(id) == -1)
+                                                               catchup_id_batch.push(id);
 
-               enableHotkeys();
-               hideAuxDlg();
-               closeInfoBox();
+                                               }
 
-               Form.enable("main_toolbar_form");
+                                               if (catchup_id_batch.length > 0) {
+                                                       window.clearTimeout(catchup_timeout_id);
 
-               var toolbar_form = document.forms["main_toolbar_form"];
-               var toolbar_query = Form.serialize("main_toolbar_form");
+                                                       if (!_infscroll_request_sent) {
+                                                               catchup_timeout_id = window.setTimeout('catchupBatchedArticles()',
+                                                                       2000);
+                                                       }
+                                               }
 
-               if (toolbar_form.query) {
-                       if (toolbar_form.query.value != "") {
-                               force_nocache = true;
+                                       });
                        }
-                       toolbar_form.query.value = "";
-               }
-
-               var query = "?op=viewfeed&feed=" + feed + "&" +
-                       toolbar_query + "&subop=" + param_escape(subop);
-
-               if ($("search_form")) {
-                       var search_query = Form.serialize("search_form");
-                       query = query + "&" + search_query;
-                       $("search_form").query.value = "";
-                       closeInfoBox(true);
-                       force_nocache = true;
                }
 
-//             console.log("IS_CAT_STORED: " + activeFeedIsCat() + ", IS_CAT: " + is_cat);
-
-               if (subop == "MarkAllRead") {
+               if (offset == 0)
+                       dijit.byId("content-tabs").selectChild(
+                               dijit.byId("content-tabs").getChildren()[0]);
 
-                       var show_next_feed = getInitParam("on_catchup_show_next_feed") == "1";
-
-                       if (show_next_feed) {
-
-                               if (!activeFeedIsCat()) {
-       
-                                       var feedlist = $('feedList');
-                               
-                                       var next_unread_feed = getRelativeFeedId2(feed, false,
-                                                       "next", true);
-
-                                       /* gRFI2 also returns categories which we don't really 
-                                        * need here, so we skip them */
-
-                                       while (next_unread_feed && next_unread_feed.match("CAT:")) 
-                                               next_unread_feed = getRelativeFeedId2(
-                                                               next_unread_feed.replace("CAT:", ""),
-                                                               true, "next", true);
-                                       
-                                       if (!next_unread_feed) {
-                                               next_unread_feed = getRelativeFeedId2(-3, true,
-                                                       "next", true);
-                                       }
-       
-                                       if (next_unread_feed) {
-                                               query = query + "&nuf=" + param_escape(next_unread_feed);
-                                               //setActiveFeedId(next_unread_feed);
-                                               feed = next_unread_feed;
-                                       }
-                               } else {
-       
-                                       var next_unread_feed = getNextUnreadCat(feed);
-
-                                       /* we don't need to specify that our next feed is actually
-                                       a category, because we're in the is_cat mode by definition
-                                       already */
-
-                                       if (next_unread_feed && show_next_feed) {
-                                               query = query + "&nuf=" + param_escape(next_unread_feed);
-                                               feed = next_unread_feed;
-                                       }
+               if (!background) {
+                       if (getActiveFeedId() != feed || offset == 0) {
+                               active_post_id = 0;
+                               _infscroll_disable = 0;
+                       }
 
+                       if (!offset && !subop && cached_headlines && !background) {
+                               try {
+                                       render_local_headlines(feed, is_cat, JSON.parse(cached_headlines));
+                                       return;
+                               } catch (e) {
+                                       console.warn("render_local_headlines failed: " + e);
                                }
                        }
-               }
 
-               if (is_cat) {
-                       query = query + "&cat=1";
-               }
+                       if (offset != 0 && !subop) {
+                               var date = new Date();
+                               var timestamp = Math.round(date.getTime() / 1000);
 
-               if (page_offset != 0) {
-                       query = query + "&skip=" + page_offset;
+                               if (_infscroll_request_sent && _infscroll_request_sent + 30 > timestamp) {
+                                       //console.log("infscroll request in progress, aborting");
+                                       return;
+                               }
 
-                       // to prevent duplicate feed titles when showing grouped vfeeds
-                       if (vgroup_last_feed) {
-                               query = query + "&vgrlf=" + param_escape(vgroup_last_feed);
+                               _infscroll_request_sent = timestamp;
                        }
+
+                       hideAuxDlg();
                }
 
                Form.enable("main_toolbar_form");
 
-               console.log(query);
-
-               var container = $("headlinesInnerContainer");
-
-               var unread_ctr = -1;
-               
-               if (!is_cat) unread_ctr = get_feed_unread(feed);
-
-               var cache_check = false;
+               var toolbar_query = Form.serialize("main_toolbar_form");
 
-               if (unread_ctr != -1 && !page_offset && !force_nocache && !subop) {
+               var query = "?op=viewfeed&feed=" + feed + "&" +
+                       toolbar_query + "&subop=" + param_escape(subop);
 
-                       var cache_prefix = "";
-                               
-                       if (is_cat) {
-                               cache_prefix = "C:";
-                       } else {
-                               cache_prefix = "F:";
+               if (!background) {
+                       if (_search_query) {
+                               force_nocache = true;
+                               query = query + "&" + _search_query;
+                               _search_query = false;
                        }
 
-                       cache_check = cache_check_param(cache_prefix + feed, unread_ctr);
-                       console.log("headline cache check: " + cache_check);
-               }
-
-               if (cache_check) {
-
-                       setActiveFeedId(feed, is_cat);
-               
-                       $("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)) {
+                       if (subop == "MarkAllRead") {
 
-                                       var img = $('FIMG-' + feed);
+                               var show_next_feed = getInitParam("on_catchup_show_next_feed") == "1";
 
-                                       if (!is_cat && img) {
+                               if (show_next_feed) {
+                                       var nuf = getNextUnreadFeed(feed, is_cat);
 
-                                               var cat_list = feedr.parentNode;
+                                       if (nuf) {
+                                               var cached_nuf = cache_get("feed:" + nuf + ":false");
 
-                                               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 (cached_nuf) {
 
-                                                       if (!$('FLL-' + feed_cat_id)) {
+                                                       render_local_headlines(nuf, false, JSON.parse(cached_nuf));
 
-                                                               var ll = document.createElement('img');
+                                                       var catchup_query = "?op=rpc&subop=catchupFeed&feed_id=" +
+                                                               feed + "&is_cat=" + is_cat;
 
-                                                               ll.src = getInitParam("sign_progress_tiny");
-                                                               ll.className = 'hlLoading';
-                                                               ll.id = 'FLL-' + feed;
+                                                       console.log(catchup_query);
 
-                                                               $("FCAP-" + feed_cat_id).appendChild(ll);
-                                                       }
-                                               } 
-                                       
-                                       } else {
+                                                       new Ajax.Request("backend.php", {
+                                                               parameters: catchup_query,
+                                                               onComplete: function(transport) {
+                                                                       handle_rpc_json(transport);
+                                                               } });
 
-                                               if (!$('FLL-' + feed)) {
-                                                       var ll = document.createElement('img');
-
-                                                       ll.src = getInitParam("sign_progress_tiny");
-                                                       ll.className = 'hlLoading';
-                                                       ll.id = 'FLL-' + feed;
-       
-                                                       feedr.appendChild(ll);
+                                                       return;
+                                               } else {
+                                                       query += "&nuf=" + param_escape(nuf);
                                                }
                                        }
-                               } 
-//                     }  
-
-                       new Ajax.Request("backend.php", {
-                               parameters: query,
-                               onComplete: function(transport) { 
-                                       headlines_callback2(transport, page_offset); 
-                               } });
-               }
-
-       } catch (e) {
-               exception_error("viewfeed", e);
-       }               
-}
+                               }
+                       }
 
+                       if (offset != 0) {
+                               query = query + "&skip=" + offset;
 
-function feedlist_dragsorted(ctr) {
-       try {
-               var cats = $$("#feedList > li[id*=FCAT-]");
-               var ordered_cats = [];
+                               // to prevent duplicate feed titles when showing grouped vfeeds
+                               if (vgroup_last_feed) {
+                                       query = query + "&vgrlf=" + param_escape(vgroup_last_feed);
+                               }
+                       }
 
-               cats.each(function(cat) {
-                       ordered_cats.push(cat.id.replace("FCAT-", ""));
-               });
+                       Form.enable("main_toolbar_form");
 
-               if (ordered_cats.length > 0) {
+                       if (!offset)
+                               if (!is_cat) {
+                                       if (!setFeedExpandoIcon(feed, is_cat, 'images/indicator_white.gif'))
+                                               notify_progress("Loading, please wait...", true);
+                               } else {
+                                       notify_progress("Loading, please wait...", true);
+                               }
+               }
 
-                       var query = "?op=feeds&subop=catsort&corder=" + 
-                               param_escape(ordered_cats.toString());
+               query += "&cat=" + is_cat;
 
-                       //console.log(query);
+               console.log(query);
 
-                       new Ajax.Request("backend.php", { parameters: query });
-               }
+               new Ajax.Request("backend.php", {
+                       parameters: query,
+                       onComplete: function(transport) {
+                               setFeedExpandoIcon(feed, is_cat, 'images/blank_icon.gif');
+                               headlines_callback2(transport, offset, background, infscrol_req);
+                       } });
 
        } catch (e) {
-               exception_error("feedlist_dragsorted", e);
+               exception_error("viewfeed", e);
        }
 }
 
 function feedlist_init() {
        try {
-               loading_set_progress(90);
-
                console.log("in feedlist init");
-               
+
                hideOrShowFeeds(getInitParam("hide_read_feeds") == 1);
                document.onkeydown = hotkey_handler;
                setTimeout("hotkey_prefix_timeout()", 5*1000);
 
-                if (getActiveFeedId()) {
-                       //console.log("some feed is open on feedlist refresh, reloading");
-                       //setTimeout("viewCurrentFeed()", 100);
-               } else {
-                       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"));
-
-               toggle_sortable_feedlist(isFeedlistSortable());
-
-       } catch (e) {
-               exception_error("feedlist/init", e);
-       }
-}
-
-/* function hide_footer_af(effect) {
-       try {
-               var c = $("content-frame");
-
-               if (c) {
-                       c.style.bottom = "0px";
-
-                       var ioa = $("inline_orig_article");
-
-                       if (ioa) {
-                               ioa.height = c.offsetHeight;
-                       }
-
-               } else {
-                       var h = $("headlines-frame");
-
-                       if (h) {
-                               h.style.bottom = "0px";
-                       }
+                if (!getActiveFeedId()) {
+                       setTimeout("viewfeed(-3)", 100);
                }
 
-       } catch (e) {
-               exception_error("hide_footer_af", e);
-       }
-} */
+               console.log("T:" +
+                               getInitParam("cdm_auto_catchup") + " " + getFeedUnread(-3));
 
-function hide_footer() {
-       try {
-               /* if (Element.visible("footer")) {
+               hideOrShowFeeds(getInitParam("hide_read_feeds") == 1);
 
-                       Element.hide("footer");
-                       dijit.byId("main").resize();
+               setTimeout("timeout()", 5000);
+               setTimeout("precache_headlines_idle()", 3000);
 
-                       //new Effect.Fade("footer", { afterFinish: hide_footer_af });
-               } */
        } catch (e) {
-               exception_error("hide_footer", e);
+               exception_error("feedlist/init", e);
        }
 }
 
-function enable_selection(b) {
-       selection_disabled = !b;
-}
-
-function enable_resize(b) {
-       resize_enabled = b;
-}
-
 function request_counters_real() {
        try {
                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,
-                       onComplete: function(transport) { 
+                       onComplete: function(transport) {
                                try {
-                                       handle_rpc_reply(transport);
+                                       handle_rpc_json(transport);
                                } catch (e) {
                                        exception_error("viewfeed/getcounters", e);
                                }
@@ -456,7 +294,7 @@ function request_counters() {
 function displayNewContentPrompt(id) {
        try {
 
-               var msg = "<a href='#' onclick='viewfeed("+id+")'>" +
+               var msg = "<a href='#' onclick='viewCurrentFeed()'>" +
                        __("New articles available in this feed (click to show)") + "</a>";
 
                msg = msg.replace("%s", getFeedName(id));
@@ -470,24 +308,17 @@ function displayNewContentPrompt(id) {
        }
 }
 
-function parse_counters(reply, scheduled_call) {
+function parse_counters(elems, scheduled_call) {
        try {
-
-               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 id = elems[l].id;
                        var kind = elems[l].kind;
-                       var ctr = parseInt(elems[l].counter)
+                       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();
@@ -499,43 +330,46 @@ function parse_counters(reply, scheduled_call) {
                                continue;
                        }
 
-                       var treeItem;
+                       // TODO: enable new content notification for categories
+
+                       if (!activeFeedIsCat() && id == getActiveFeedId()
+                                       && ctr > getFeedUnread(id) && scheduled_call) {
+                               displayNewContentPrompt(id);
+                       }
+
+                       if (getFeedUnread(id, (kind == "cat")) != ctr)
+                               cache_delete("feed:" + id + ":" + (kind == "cat"));
 
                        setFeedUnread(id, (kind == "cat"), ctr);
 
                        if (kind != "cat") {
-                               //setFeedValue(id, false, 'error', error);
+                               setFeedValue(id, false, 'error', error);
                                setFeedValue(id, false, 'updated', updated);
-                       }
-               }
-       
-               hideOrShowFeeds(getInitParam("hide_read_feeds") == 1);
-
-               var feeds_stored = number_of_feeds;
 
-               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()', 50);
+                               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);
+
        } catch (e) {
                exception_error("parse_counters", e);
        }
 }
 
-function get_feed_unread(feed, is_cat) {
+function getFeedUnread(feed, is_cat) {
        try {
-               if (is_cat) 
-                       treeItem = treeModel.store._itemsByIdentity['CAT:' + feed];
-               else
-                       treeItem = treeModel.store._itemsByIdentity['FEED:' + feed];
+               var tree = dijit.byId("feedTree");
 
-               if (treeItem)
-                       return treeModel.store.getValue(treeItem, 'unread');
+               if (tree && tree.model)
+                       return tree.model.getFeedUnread(feed, is_cat);
 
        } catch (e) {
                //
@@ -544,374 +378,132 @@ function get_feed_unread(feed, is_cat) {
        return -1;
 }
 
-function get_cat_unread(id) {
-       return get_feed_unread(id, true);
-}
-
-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;
-       }
-}
-
-function get_feed_entry_name(elem) {
-       var id = elem.id.replace("FEEDR-", "");
-       return getFeedName(id);
-}
-
-
-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("resort_category", 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);
-       }
+       console.warn("resort_feedlist: function not implemented");
 }
 
 function hideOrShowFeeds(hide) {
        var tree = dijit.byId("feedTree");
 
-       if (getInitParam("enable_feed_cats")) {
-
-               var cats = tree.model.store._arrayOfTopLevelItems;
+       if (tree)
+               return tree.hideRead(hide, getInitParam("hide_read_shows_special"));
+}
 
-               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;
-                               }
-                       }
-       
-               });
+function getFeedName(feed, is_cat) {
+       var tree = dijit.byId("feedTree");
 
-       } else {
-               hideOrShowFeedsCategory(tree.model.store._arrayOfTopLevelItems, hide);
-       }
+       if (tree && tree.model)
+               return tree.model.getFeedValue(feed, is_cat, 'name');
+}
 
-/*     try {
+function getFeedValue(feed, is_cat, key) {
+       try {
+               var tree = dijit.byId("feedTree");
 
-               if ($("FCATLIST--1")) {
-       
-                       var lists = $$("#feedList ul[id*=FCATLIST]");
-       
-                       lists.each(function(list) {
-                                       hideOrShowFeedsCategory(list.id.replace("FCATLIST-", ""), hide);
-                               });
-       
-               } else {
-                       hideOrShowFeedsCategory(null, hide);
-               }
+               if (tree && tree.model)
+                       return tree.model.getFeedValue(feed, is_cat, key);
 
        } catch (e) {
-               exception_error("hideOrShowFeeds", e);
-       } */
+               //
+       }
+       return '';
 }
 
-function hideOrShowFeedsCategory(feeds, hide) {
+function setFeedUnread(feed, is_cat, unread) {
        try {
-               //console.warn("hideOrShowFeedsCategory: function not implemented");
-       var tree = dijit.byId("feedTree");
-       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 {
-                       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;
-                       }
-
-               });
+               var tree = dijit.byId("feedTree");
 
-               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);
-                       }
-               } */
+               if (tree && tree.model)
+                       return tree.model.setFeedUnread(feed, is_cat, unread);
 
        } catch (e) {
-               exception_error("hideOrShowFeedsCategory", e);
+               exception_error("setFeedUnread", e);
        }
 }
 
-function getFeedName(feed, is_cat) {   
-       return getFeedValue(feed, is_cat, 'name');
-}
-
-function getFeedValue(feed, is_cat, key) {     
-
+function setFeedValue(feed, is_cat, key, value) {
        try {
-               if (is_cat) 
-                       treeItem = treeModel.store._itemsByIdentity['CAT:' + feed];
-               else
-                       treeItem = treeModel.store._itemsByIdentity['FEED:' + feed];
+               var tree = dijit.byId("feedTree");
 
-               if (treeItem)
-                       return treeModel.store.getValue(treeItem, key);
+               if (tree && tree.model)
+                       return tree.model.setFeedValue(feed, is_cat, key, value);
 
        } catch (e) {
                //
        }
-
-       return '';
 }
 
-function getNextUnreadCat(id) {
+function selectFeed(feed, is_cat) {
        try {
-               var rows = $$("#feedList li[id*=FCAT]");
-               var unread_cats = [];
-
-               rows.each(function(row) {
-                       var cat_id = row.id.replace("FCAT-", "");
-
-                       if (Element.visible(row) && get_cat_unread(cat_id) > 0)
-                               unread_cats.push(parseInt(cat_id));
-                       });
+               var tree = dijit.byId("feedTree");
 
-               console.log(unread_cats);
-               
-               var idx = unread_cats.indexOf(id);
-
-               if (idx != -1 && idx < unread_cats.length-1) {
-                       return unread_cats[idx+1];                                      
-               } else {
-                       return unread_cats[0];
-               }
+               if (tree) return tree.selectFeed(feed, is_cat);
 
        } catch (e) {
-               exception_error("getNextUnreadCat", e);
+               exception_error("selectFeed", e);
        }
 }
 
-function getRelativeFeedId2(id, is_cat, direction, unread_only) {      
+function setFeedIcon(feed, is_cat, src) {
        try {
+               var tree = dijit.byId("feedTree");
 
-//             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);
-                               }
-                       }
-       
-               }
+               if (tree) return tree.setFeedIcon(feed, is_cat, src);
 
        } catch (e) {
-               exception_error("getRelativeFeedId2", e);
+               exception_error("setFeedIcon", e);
        }
 }
 
-function feedsSortByUnread() {
-       return feeds_sort_by_unread;
-}
-
-function setFeedUnread(feed, is_cat, unread) {
+function setFeedExpandoIcon(feed, is_cat, src) {
        try {
-               setFeedValue(feed, is_cat, 'unread', parseInt(unread));
+               var tree = dijit.byId("feedTree");
+
+               if (tree) return tree.setFeedExpandoIcon(feed, is_cat, src);
+
        } catch (e) {
-               exception_error("setFeedUnread", e);
+               exception_error("setFeedIcon", e);
        }
+       return false;
 }
 
-function setFeedValue(feed, is_cat, key, value) {
+function getNextUnreadFeed(feed, is_cat) {
        try {
-               if (!value) value = '';
-
-               if (is_cat) 
-                       treeItem = treeModel.store._itemsByIdentity['CAT:' + feed];
-               else
-                       treeItem = treeModel.store._itemsByIdentity['FEED:' + feed];
+               var tree = dijit.byId("feedTree");
+               var nuf = tree.model.getNextUnreadFeed(feed, is_cat);
 
-               if (treeItem)
-                       treeModel.store.setValue(treeItem, key, value);
+               if (nuf)
+                       return tree.model.store.getValue(nuf, 'bare_id');
 
        } catch (e) {
-               exception_error("setFeedValue", e);
+               exception_error("getNextUnreadFeed", e);
        }
 }
 
-function toggleCollapseCat(id) {
-       console.warn("toggleCollapseCat: function not implemented");
-}
-
-function selectFeed(feed, is_cat) {
+function catchupFeed(feed, is_cat) {
        try {
-               var tree = dijit.byId("feedTree");
+               var str = __("Mark all articles in %s as read?");
+               var fn = getFeedName(getActiveFeedId(), activeFeedIsCat());
 
-               if (is_cat) 
-                       treeNode = tree._itemNodesMap['CAT:' + feed];
-               else
-                       treeNode = tree._itemNodesMap['FEED:' + feed];
+               str = str.replace("%s", fn);
 
-               if (treeNode) {
-                       treeNode = treeNode[0];
-                       tree._expandNode(treeNode);
-                       tree._selectNode(treeNode);
+               if (getInitParam("confirm_feed_catchup") == 1 && !confirm(str)) {
+                       return;
                }
 
+               var catchup_query = "?op=rpc&subop=catchupFeed&feed_id=" +
+                       feed + "&is_cat=" + is_cat;
+
+               notify_progress("Loading, please wait...", true);
+
+               new Ajax.Request("backend.php", {
+                       parameters: catchup_query,
+                       onComplete: function(transport) {
+                                       handle_rpc_json(transport);
+                                       notify("");
+                               } });
+
        } catch (e) {
-               exception_error("selectFeed", e);
+               exception_error("catchupFeed", e);
        }
 }