]> git.wh0rd.org - tt-rss.git/blobdiff - viewfeed.js
check for backend-returned fatal errors in major callbacks
[tt-rss.git] / viewfeed.js
index a9a413acb9ae763552bfee1e488ceded3fba9079..0f5345b9bfdd44ea16998bfb4f7b3d3c3f47d958 100644 (file)
@@ -1,15 +1,7 @@
 var active_post_id = false;
-var _catchup_callback_func = false;
 var last_article_view = false;
 var active_real_feed_id = false;
 
-var _tag_active_post_id = false;
-var _tag_active_feed_id = false;
-var _tag_active_cdm = false;
-
-// FIXME: kludge, to restore scrollTop after tag editor terminates
-var _tag_cdm_scroll = false;
-
 // FIXME: kludges, needs proper implementation
 var _reload_feedlist_after_view = false;
 
@@ -18,12 +10,17 @@ var _cdm_wd_vishist = new Array();
 
 var article_cache = new Array();
 
+var vgroup_last_feed = false;
+var post_under_pointer = false;
+
+var last_requested_article = false;
+
 function catchup_callback() {
        if (xmlhttp_rpc.readyState == 4) {
                try {
                        debug("catchup_callback");
                        notify("");                     
-                       all_counters_callback();
+                       all_counters_callback2(xmlhttp_rpc);
                        if (_catchup_callback_func) {
                                setTimeout(_catchup_callback_func, 10); 
                        }
@@ -33,9 +30,71 @@ function catchup_callback() {
        }
 }
 
-function headlines_callback() {
-       if (xmlhttp.readyState == 4) {
-               debug("headlines_callback");
+function catchup_callback2(transport, callback) {
+       try {
+               debug("catchup_callback2 " + transport + ", " + callback);
+               notify("");                     
+               all_counters_callback2(transport);
+               if (callback) {
+                       setTimeout(callback, 10);       
+               }
+       } catch (e) {
+               exception_error("catchup_callback2", e, transport);
+       }
+}
+
+function clean_feed_selections() {
+       try {
+               var feeds = document.getElementById("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", "");
+                       }
+               }
+       } catch (e) {
+               exception_error("clean_feed_selections", e);
+       }
+}
+
+function headlines_callback2(transport, feed_cur_page) {
+       try {
+
+               loading_set_progress(100);
+
+               debug("headlines_callback2 [page=" + feed_cur_page + "]");
+
+               if (!transport_error_check(transport)) return;
+
+               clean_feed_selections();
+       
+               var is_cat = false;
+               var feed_id = false;
+
+               if (transport.responseXML) {
+                       var headlines = transport.responseXML.getElementsByTagName("headlines")[0];
+                       if (headlines) {
+                               is_cat = headlines.getAttribute("is_cat");
+                               feed_id = headlines.getAttribute("id");
+                               setActiveFeedId(feed_id, is_cat);
+                       }
+               }
+
+               if (!is_cat) {
+                       var feedr = document.getElementById("FEEDR-" + feed_id);
+                       if (feedr && !feedr.className.match("Selected")) {      
+                               feedr.className = feedr.className + "Selected";
+                       } 
+               } else {
+                       var feedr = document.getElementById("FCAT-" + feed_id);
+                       if (feedr && !feedr.className.match("Selected")) {      
+                               feedr.className = feedr.className + "Selected";
+                       } 
+               }
+       
                var f = document.getElementById("headlines-frame");
                try {
                        if (feed_cur_page == 0) { 
@@ -43,16 +102,50 @@ function headlines_callback() {
                                f.scrollTop = 0; 
                        }
                } catch (e) { };
+       
+               if (transport.responseXML) {
+                       var headlines = transport.responseXML.getElementsByTagName("headlines")[0];
+                       var headlines_count_obj = transport.responseXML.getElementsByTagName("headlines-count")[0];
+                       var headlines_unread_obj = transport.responseXML.getElementsByTagName("headlines-unread")[0];
+                       var disable_cache_obj = transport.responseXML.getElementsByTagName("disable-cache")[0];
+
+                       var vgroup_last_feed_obj =  transport.responseXML.getElementsByTagName("vgroup-last-feed")[0];
+
+                       var headlines_count = headlines_count_obj.getAttribute("value");
+                       var headlines_unread = headlines_unread_obj.getAttribute("value");
+                       var disable_cache = disable_cache_obj.getAttribute("value") != "0";
 
-               if (xmlhttp.responseXML) {
-                       var headlines = xmlhttp.responseXML.getElementsByTagName("headlines")[0];
-                       var counters = xmlhttp.responseXML.getElementsByTagName("counters")[0];
-                       var articles = xmlhttp.responseXML.getElementsByTagName("article");
-                       var runtime_info = xmlhttp.responseXML.getElementsByTagName("runtime-info");
+                       vgroup_last_feed = vgroup_last_feed_obj.getAttribute("value");
 
+                       if (headlines_count == 0) {
+                               _infscroll_disable = 1;
+                       } else {
+                               _infscroll_disable = 0;
+                       }
+
+                       var counters = transport.responseXML.getElementsByTagName("counters")[0];
+                       var articles = transport.responseXML.getElementsByTagName("article");
+                       var runtime_info = transport.responseXML.getElementsByTagName("runtime-info");
+       
                        if (feed_cur_page == 0) {
                                if (headlines) {
                                        f.innerHTML = headlines.firstChild.nodeValue;
+
+                                       var cache_prefix = "";
+
+                                       if (is_cat) {
+                                               cache_prefix = "C:";
+                                       } else {
+                                               cache_prefix = "F:";
+                                       }
+
+                                       cache_invalidate(cache_prefix + feed_id);
+
+                                       if (!disable_cache) {
+                                               cache_inject(cache_prefix + feed_id,
+                                                       headlines.firstChild.nodeValue, headlines_unread);
+                                       }
+
                                } else {
                                        debug("headlines_callback: returned no data");
                                f.innerHTML = "<div class='whiteBox'>" + __('Could not update headlines (missing XML data)') + "</div>";
@@ -60,22 +153,35 @@ function headlines_callback() {
                                }
                        } else {
                                if (headlines) {
-                                       debug("adding some more headlines...");
+                                       if (headlines_count > 0) {
+                                               debug("adding some more headlines...");
+       
+                                               var c = document.getElementById("headlinesList");
+               
+                                               if (!c) {
+                                                       c = document.getElementById("headlinesInnerContainer");
+                                               }
 
-                                       var c = document.getElementById("headlinesList");
+                                               var ids = getSelectedArticleIds2();
+       
+                                               c.innerHTML = c.innerHTML + headlines.firstChild.nodeValue;
 
-                                       if (!c) {
-                                               c = document.getElementById("headlinesInnerContainer");
-                                       }
+                                               debug("restore selected ids: " + ids);
 
-                                       c.innerHTML = c.innerHTML + headlines.firstChild.nodeValue;
+                                               for (var i = 0; i < ids.length; i++) {
+                                                       markHeadline(ids[i]);
+                                               }
+
+                                       } else {
+                                               debug("no new headlines received");
+                                       }
                                } else {
                                        debug("headlines_callback: returned no data");
                                        notify_error("Error while trying to load more headlines");      
                                }
 
                        }
-
+       
                        if (articles) {
                                for (var i = 0; i < articles.length; i++) {
                                        var a_id = articles[i].getAttribute("id");
@@ -85,33 +191,35 @@ function headlines_callback() {
                        } else {
                                debug("no cached articles received");
                        }
-
+       
                        if (counters) {
                                debug("parsing piggybacked counters: " + counters);
                                parse_counters(counters, false);
                        } else {
-                               debug("counters container not found in reply");
+                               debug("counters container not found in reply, requesting...");
+                               request_counters();
                        }
-
+       
                        if (runtime_info) {
                                debug("parsing runtime info: " + runtime_info[0]);
                                parse_runtime_info(runtime_info[0]);
                        } else {
                                debug("counters container not found in reply");
                        }
-
+       
                } else {
                        debug("headlines_callback: returned no XML object");
                        f.innerHTML = "<div class='whiteBox'>" + __('Could not update headlines (missing XML object)') + "</div>";
                }
-
+       
                if (typeof correctPNG != 'undefined') {
                        correctPNG();
                }
-
+       
                if (_cdm_wd_timeout) window.clearTimeout(_cdm_wd_timeout);
-
+       
                if (!document.getElementById("headlinesList") && 
+                               getActiveFeedId() != -3 &&
                                getInitParam("cdm_auto_catchup") == 1) {
                        debug("starting CDM watchdog");
                        _cdm_wd_timeout = window.setTimeout("cdmWatchdog()", 5000);
@@ -119,17 +227,16 @@ function headlines_callback() {
                } else {
                        debug("not in CDM mode or watchdog disabled");
                }
+       
+               _feed_cur_page = feed_cur_page;
+               _infscroll_request_sent = 0;
 
-               if (_tag_cdm_scroll) {
-                       try {
-                               document.getElementById("headlinesInnerContainer").scrollTop = _tag_cdm_scroll;
-                               _tag_cdm_scroll = false;
-                               debug("resetting headlinesInner scrollTop");
+               notify("");
 
-                       } catch (e) { }
-               }
+               remove_splash();
 
-               notify("");
+       } catch (e) {
+               exception_error("headlines_callback2", e, transport);
        }
 }
 
@@ -140,43 +247,123 @@ function render_article(article) {
                        f.scrollTop = 0;
                } catch (e) { };
 
-               f.innerHTML = article;
+               var fi = document.getElementById("content-insert");
+
+               try {
+                       fi.scrollTop = 0;
+               } catch (e) { };
+
+               fi.innerHTML = article;
 
        } catch (e) {
                exception_error("render_article", e);
        }
 }
 
-function article_callback() {
-       if (xmlhttp.readyState == 4) {
-               debug("article_callback");
+function showArticleInHeadlines(id) {
+
+       try {
+
+               cleanSelected("headlinesList");
+       
+               var crow = document.getElementById("RROW-" + id);
+
+               if (!crow) return;
+
+               var article_is_unread = crow.className.match("Unread");
+                       
+               crow.className = crow.className.replace("Unread", "");
+
+               selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', false);
+       
+               var upd_img_pic = document.getElementById("FUPDPIC-" + id);
+
+               var cache_prefix = "";
+                               
+               if (activeFeedIsCat()) {
+                       cache_prefix = "C:";
+               } else {
+                       cache_prefix = "F:";
+               }
+
+               var view_mode = false;
 
                try {
-                       if (xmlhttp.responseXML) {
-                               var reply = xmlhttp.responseXML.firstChild.firstChild;
+                       view_mode = document.forms['main_toolbar_form'].view_mode;      
+                       view_mode = view_mode[view_mode.selectedIndex].value;
+               } catch (e) {
+                       //
+               }
 
-                               var articles = xmlhttp.responseXML.getElementsByTagName("article");
+               if (upd_img_pic && upd_img_pic.src.match("updated.png")) {
+                       upd_img_pic.src = "images/blank_icon.gif";
 
-                               for (var i = 0; i < articles.length; i++) {
-                                       var a_id = articles[i].getAttribute("id");
+                       cache_invalidate(cache_prefix + getActiveFeedId());
 
-                                       debug("found id: " + a_id);
+                       cache_inject(cache_prefix + getActiveFeedId(),
+                               document.getElementById("headlines-frame").innerHTML,
+                               get_feed_unread(getActiveFeedId()));
 
-                                       if (a_id == active_post_id) {
-                                               debug("active article, rendering...");                                  
-                                               render_article(articles[i].firstChild.nodeValue);
-                                       }
+               } else if (article_is_unread && view_mode == "all_articles") {
 
-                                       cache_inject(a_id, articles[i].firstChild.nodeValue);
+                       cache_invalidate(cache_prefix + getActiveFeedId());
+
+                       cache_inject(cache_prefix + getActiveFeedId(),
+                               document.getElementById("headlines-frame").innerHTML,
+                               get_feed_unread(getActiveFeedId())-1);
+
+               } else if (article_is_unread) {
+                       cache_invalidate(cache_prefix + getActiveFeedId());
+               }
+
+               markHeadline(id);
+
+       } catch (e) {
+               exception_error("showArticleInHeadlines", e);
+       }
+}
+
+function article_callback2(transport, id, feed_id) {
+       try {
+               debug("article_callback2 " + id);
+
+               if (transport.responseXML) {
+
+                       if (!transport_error_check(transport)) return;
+
+                       debug("looking for articles to cache...");
+
+                       var articles = transport.responseXML.getElementsByTagName("article");
+
+                       for (var i = 0; i < articles.length; i++) {
+                               var a_id = articles[i].getAttribute("id");
+
+                               debug("found id: " + a_id);
+
+                               if (a_id == active_post_id) {
+                                       debug("active article, rendering...");                                  
+                                       render_article(articles[i].firstChild.nodeValue);
                                }
-                       
-                       } else {
-                               debug("article_callback: returned no XML object");
-                               var f = document.getElementById("content-frame");
-                               f.innerHTML = "<div class='whiteBox'>" + __('Could not display article (missing XML object)') + "</div>";
+
+                               cache_inject(a_id, articles[i].firstChild.nodeValue);
                        }
-               } catch (e) {
-                       exception_error("article_callback", e);
+
+                       if (id != last_requested_article) {
+                               debug("requested article id is out of sequence, aborting");
+                               return;
+                       }
+
+                       active_real_feed_id = feed_id;
+                       active_post_id = id; 
+
+                       showArticleInHeadlines(id);     
+
+                       var reply = transport.responseXML.firstChild.firstChild;
+               
+               } else {
+                       debug("article_callback: returned no XML object");
+                       //var f = document.getElementById("content-frame");
+                       //f.innerHTML = "<div class='whiteBox'>" + __('Could not display article (missing XML object)') + "</div>";
                }
 
                var date = new Date();
@@ -190,17 +377,20 @@ function article_callback() {
                        setTimeout('updateFeedList(false, false)', 50);                 
                        _reload_feedlist_after_view = false;
                } else {
-                       var counters = xmlhttp.responseXML.getElementsByTagName("counters")[0];
+                       var counters = transport.responseXML.getElementsByTagName("counters")[0];
 
                        if (counters) {
                                debug("parsing piggybacked counters: " + counters);
                                parse_counters(counters, false);
                        } else {
-                               debug("counters container not found in reply");
+                               debug("counters container not found in reply, requesting...");
+                               request_counters();
                        }
                }
 
                notify("");
+       } catch (e) {
+               exception_error("article_callback2", e, transport);
        }
 }
 
@@ -208,9 +398,7 @@ function view(id, feed_id, skip_history) {
        
        try {
                debug("loading article: " + id + "/" + feed_id);
-
-               active_real_feed_id = feed_id;
-
+       
                var cached_article = cache_find(id);
 
                debug("cache check result: " + (cached_article != false));
@@ -224,106 +412,70 @@ function view(id, feed_id, skip_history) {
 
                var date = new Date();
 
-               if (!xmlhttp_ready(xmlhttp) && last_article_view < date.getTime() / 1000 - 15) {
-                       debug("<b>xmlhttp seems to be stuck at view, aborting</b>");
-                       xmlhttp.abort();
-                       if (is_safari()) {
-                               debug("trying alternative reset method for Safari");
-                               xmlhttp = Ajax.getTransport();
-                       }
-               }
-
-               if (xmlhttp_ready(xmlhttp)) {
-
-                       active_post_id = id; 
-
-                       cleanSelected("headlinesList");
-
-                       var crow = document.getElementById("RROW-" + active_post_id);
-
-                       var article_is_unread = crow.className.match("Unread");
-                       debug("article is unread: " + article_is_unread);                       
-
-                       crow.className = crow.className.replace("Unread", "");
-
-                       var upd_img_pic = document.getElementById("FUPDPIC-" + active_post_id);
-
-                       if (upd_img_pic) {
-                               upd_img_pic.src = "images/blank_icon.gif";
-                       }
-
-                       selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', false);
-                       markHeadline(active_post_id);
+               var neighbor_ids = getRelativePostIds(active_post_id);
 
-                       var neighbor_ids = getRelativePostIds(active_post_id);
+               /* only request uncached articles */
 
-                       /* only request uncached articles */
-
-                       var cids_to_request = Array();
+               var cids_to_request = Array();
 
-                       for (var i = 0; i < neighbor_ids.length; i++) {
-                               if (!cache_check(neighbor_ids[i])) {
-                                       cids_to_request.push(neighbor_ids[i]);
-                               }
+               for (var i = 0; i < neighbor_ids.length; i++) {
+                       if (!cache_check(neighbor_ids[i])) {
+                               cids_to_request.push(neighbor_ids[i]);
                        }
+               }
 
-                       debug("additional ids: " + cids_to_request.toString());                 
-
-                       /* additional info for piggyback counters */
+               debug("additional ids: " + cids_to_request.toString());                 
 
-                       if (tagsAreDisplayed()) {
-                               query = query + "&omode=lt";
-                       } else {
-                               query = query + "&omode=flc";
-                       }
+               /* additional info for piggyback counters */
 
-                       var date = new Date();
-                       var timestamp = Math.round(date.getTime() / 1000);
-                       query = query + "&ts=" + timestamp;
+               if (tagsAreDisplayed()) {
+                       query = query + "&omode=lt";
+               } else {
+                       query = query + "&omode=flc";
+               }
 
-                       query = query + "&cids=" + cids_to_request.toString();
+               var date = new Date();
+               var timestamp = Math.round(date.getTime() / 1000);
+               query = query + "&ts=" + timestamp;
 
-                       if (!cached_article) {
+               query = query + "&cids=" + cids_to_request.toString();
 
-                               notify_progress("Loading, please wait...");
+               var crow = document.getElementById("RROW-" + id);
+               var article_is_unread = crow.className.match("Unread");
 
-                               debug(query);
+               if (!async_counters_work) {
+                       query = query + "&csync=true";
+               }
 
-                               xmlhttp.open("GET", query, true);
-                               xmlhttp.onreadystatechange=article_callback;
-                               xmlhttp.send(null);
-                       } else if (cached_article && article_is_unread) {
+               showArticleInHeadlines(id);
 
-                               query = query + "&mode=prefetch";
+               if (!cached_article) {
 
-                               debug(query);
+                       notify_progress("Loading, please wait...", true);
 
-                               xmlhttp.open("GET", query, true);
-                               xmlhttp.onreadystatechange=article_callback;
-                               xmlhttp.send(null);
+               } else if (cached_article && article_is_unread) {
 
-                               render_article(cached_article);
+                       query = query + "&mode=prefetch";
 
-                       } else if (cached_article) {
+                       render_article(cached_article);
 
-                               query = query + "&mode=prefetch_old";
+               } else if (cached_article) {
 
-                               debug(query);
+                       query = query + "&mode=prefetch_old";
+                       render_article(cached_article);
 
-                               xmlhttp.open("GET", query, true);
-                               xmlhttp.onreadystatechange=article_callback;
-                               xmlhttp.send(null);
+               }
 
-                               render_article(cached_article);
+               cache_expire();
 
-                       }
+               last_requested_article = id;
 
-                       cache_expire();
+               new Ajax.Request(query, {
+                       onComplete: function(transport) { 
+                               article_callback2(transport, id, feed_id); 
+                       } });
 
-               } else {
-                       debug("xmlhttp busy (@view)");
-                       printLockingError();
-               }  
+               return false;
 
        } catch (e) {
                exception_error("view", e);
@@ -345,8 +497,8 @@ function tMark_afh_off(effect) {
                debug("tMark_afh_off : " + elem.id);
 
                if (elem) {
-                       elem.src = "images/mark_unset.png";
-                       elem.alt = "Set mark";
+                       elem.src = elem.src.replace("mark_set", "mark_unset");
+                       elem.alt = __("Star article");
                        Element.show(elem);
                }
 
@@ -362,8 +514,8 @@ function tPub_afh_off(effect) {
                debug("tPub_afh_off : " + elem.id);
 
                if (elem) {
-                       elem.src = "images/pub_unset.png";
-                       elem.alt = "Publish";
+                       elem.src = elem.src.replace("pub_set", "pub_unset");
+                       elem.alt = __("Publish article");
                        Element.show(elem);
                }
 
@@ -372,15 +524,10 @@ function tPub_afh_off(effect) {
        }
 }
 
-function toggleMark(id) {
+function toggleMark(id, client_only, no_effects) {
 
        try {
 
-               if (!xmlhttp_ready(xmlhttp_rpc)) {
-                       printLockingError();
-                       return;
-               }
-       
                var query = "backend.php?op=rpc&id=" + id + "&subop=mark";
        
                query = query + "&afid=" + getActiveFeedId();
@@ -392,72 +539,49 @@ function toggleMark(id) {
                }
        
                var mark_img = document.getElementById("FMPIC-" + id);
+
+               if (!mark_img) return;
+
                var vfeedu = document.getElementById("FEEDU--1");
                var crow = document.getElementById("RROW-" + id);
        
-               if (mark_img.alt != "Reset mark") {
-                       mark_img.src = "images/mark_set.png";
-                       mark_img.alt = "Reset mark";
+               if (mark_img.src.match("mark_unset")) {
+                       mark_img.src = mark_img.src.replace("mark_unset", "mark_set");
+                       mark_img.alt = __("Unstar article");
                        query = query + "&mark=1";
-       
-/*                     if (vfeedu && crow.className.match("Unread")) {
-                               vfeedu.innerHTML = (+vfeedu.innerHTML) + 1;
-                       } */
-       
+
                } else {
                        //mark_img.src = "images/mark_unset.png";
-                       mark_img.alt = "Please wait...";
+                       mark_img.alt = __("Please wait...");
                        query = query + "&mark=0";
        
-/*                     if (vfeedu && crow.className.match("Unread")) {
-                               vfeedu.innerHTML = (+vfeedu.innerHTML) - 1;
-                       } */
-       
-                       if (document.getElementById("headlinesList")) {
+                       if (document.getElementById("headlinesList") && !no_effects) {
                                Effect.Puff(mark_img, {duration : 0.25, afterFinish: tMark_afh_off});
                        } else { 
-                               mark_img.src = "images/mark_unset.png";
-                               mark_img.alt = "Set mark";
-                       }
-               }
-       
-/*             var vfeedctr = document.getElementById("FEEDCTR--1");
-               var vfeedr = document.getElementById("FEEDR--1");
-       
-               if (vfeedu && vfeedctr) {
-                       if ((+vfeedu.innerHTML) > 0) {
-                               if (crow.className.match("Unread") && !vfeedr.className.match("Unread")) {
-                                       vfeedr.className = vfeedr.className + "Unread";
-                                       vfeedctr.className = "odd";
-                               }
-                       } else {
-                               vfeedctr.className = "invisible";
-                               vfeedr.className = vfeedr.className.replace("Unread", "");
+                               mark_img.src = mark_img.src.replace("mark_set", "mark_unset");
+                               mark_img.alt = __("Star article");
                        }
                }
-       
-               debug("toggle starred for aid " + id);
-       
-               //new Ajax.Request(query); */
 
-               xmlhttp_rpc.open("GET", query, true);
-               xmlhttp_rpc.onreadystatechange=all_counters_callback;
-               xmlhttp_rpc.send(null);
+               if (!client_only) {
+                       debug(query);
+
+                       new Ajax.Request(query, {
+                               onComplete: function(transport) { 
+                                       all_counters_callback2(transport); 
+                               } });
+
+               }
 
        } catch (e) {
                exception_error("toggleMark", e);
        }
 }
 
-function togglePub(id) {
+function togglePub(id, client_only, no_effects) {
 
        try {
 
-               if (!xmlhttp_ready(xmlhttp_rpc)) {
-                       printLockingError();
-                       return;
-               }
-       
                var query = "backend.php?op=rpc&id=" + id + "&subop=publ";
        
                query = query + "&afid=" + getActiveFeedId();
@@ -469,57 +593,37 @@ function togglePub(id) {
                }
        
                var mark_img = document.getElementById("FPPIC-" + id);
+
+               if (!mark_img) return;
+
                var vfeedu = document.getElementById("FEEDU--2");
                var crow = document.getElementById("RROW-" + id);
        
-               if (mark_img.alt != "Unpublish") {
-                       mark_img.src = "images/pub_set.png";
-                       mark_img.alt = "Unpublish";
+               if (mark_img.src.match("pub_unset")) {
+                       mark_img.src = mark_img.src.replace("pub_unset", "pub_set");
+                       mark_img.alt = __("Unpublish article");
                        query = query + "&pub=1";
        
-/*                     if (vfeedu && crow.className.match("Unread")) {
-                               vfeedu.innerHTML = (+vfeedu.innerHTML) + 1;
-                       } */
-       
+
                } else {
                        //mark_img.src = "images/pub_unset.png";
-                       mark_img.alt = "Please wait...";
+                       mark_img.alt = __("Please wait...");
                        query = query + "&pub=0";
        
-/*                     if (vfeedu && crow.className.match("Unread")) {
-                               vfeedu.innerHTML = (+vfeedu.innerHTML) - 1;
-                       } */
-
-                       if (document.getElementById("headlinesList")) {
+                       if (document.getElementById("headlinesList") && !no_effects) {
                                Effect.Puff(mark_img, {duration : 0.25, afterFinish: tPub_afh_off});
                        } else { 
-                               mark_img.src = "images/pub_unset.png";
-                               mark_img.alt = "Publish";
-                       }
-               }
-       
-/*             var vfeedctr = document.getElementById("FEEDCTR--2");
-               var vfeedr = document.getElementById("FEEDR--2");
-       
-               if (vfeedu && vfeedctr) {
-                       if ((+vfeedu.innerHTML) > 0) {
-                               if (crow.className.match("Unread") && !vfeedr.className.match("Unread")) {
-                                       vfeedr.className = vfeedr.className + "Unread";
-                                       vfeedctr.className = "odd";
-                               }
-                       } else {
-                               vfeedctr.className = "invisible";
-                               vfeedr.className = vfeedr.className.replace("Unread", "");
+                               mark_img.src = mark_img.src.replace("pub_set", "pub_unset");
+                               mark_img.alt = __("Publish article");
                        }
                }
-       
-               debug("toggle published for aid " + id);
-       
-               new Ajax.Request(query); */
 
-               xmlhttp_rpc.open("GET", query, true);
-               xmlhttp_rpc.onreadystatechange=all_counters_callback;
-               xmlhttp_rpc.send(null);
+               if (!client_only) {
+                       new Ajax.Request(query, {
+                               onComplete: function(transport) { 
+                                       all_counters_callback2(transport); 
+                               } });
+               }
 
        } catch (e) {
 
@@ -561,75 +665,174 @@ function correctHeadlinesOffset(id) {
 
 function moveToPost(mode) {
 
-       // check for combined mode
-       if (!document.getElementById("headlinesList"))
-               return;
-
-       var rows = getVisibleHeadlineIds();
-
-       var prev_id = false;
-       var next_id = false;
+       try {
 
-       if (!document.getElementById('RROW-' + active_post_id)) {
-               active_post_id = false;
-       }
+               var rows;
 
-       if (active_post_id == false) {
-               next_id = getFirstVisibleHeadlineId();
-               prev_id = getLastVisibleHeadlineId();
-       } else {        
-               for (var i = 0; i < rows.length; i++) {
-                       if (rows[i] == active_post_id) {
-                               prev_id = rows[i-1];
-                               next_id = rows[i+1];                    
+               if (isCdmMode()) {
+                       rows = cdmGetVisibleArticles();
+               } else {
+                       rows = getVisibleHeadlineIds();
+               }
+               
+               var prev_id = false;
+               var next_id = false;
+               
+               if (!document.getElementById('RROW-' + active_post_id)) {
+                       active_post_id = false;
+               }
+               
+               if (active_post_id == false) {
+                       next_id = getFirstVisibleHeadlineId();
+                       prev_id = getLastVisibleHeadlineId();
+               } else {        
+                       for (var i = 0; i < rows.length; i++) {
+                               if (rows[i] == active_post_id) {
+                                       prev_id = rows[i-1];
+                                       next_id = rows[i+1];                    
+                               }
                        }
                }
-       }
+               
+               if (mode == "next") {
+                       if (next_id) {
+                               if (isCdmMode()) {
+       
+                                       if (!cdmArticleIsActuallyVisible(next_id)) {
+                                               cdmScrollToArticleId(next_id);
+                                       }
+                                       cdmSelectArticles("none");
+                                       toggleUnread(next_id, 0, true);
+                                       toggleSelected(next_id);
 
-       if (mode == "next") {
-               if (next_id) {
-                       correctHeadlinesOffset(next_id);
-                       view(next_id, getActiveFeedId());
+                               } else {
+                                       correctHeadlinesOffset(next_id);
+                                       view(next_id, getActiveFeedId());
+                               }
+                       }
                }
-       }
+               
+               if (mode == "prev") {
+                       if (prev_id) {
+                               if (isCdmMode()) {
+                                       cdmScrollToArticleId(prev_id);
+                                       cdmSelectArticles("none");
+                                       toggleUnread(prev_id, 0, true);
+                                       toggleSelected(prev_id);
+                               } else {
+                                       correctHeadlinesOffset(prev_id);
+                                       view(prev_id, getActiveFeedId());
+                               }
+                       }
+               } 
 
-       if (mode == "prev") {
-               if (prev_id) {
-                       correctHeadlinesOffset(prev_id);
-                       view(prev_id, getActiveFeedId());
-               }
-       } 
+       } catch (e) {
+               exception_error("moveToPost", e);
+       }
 }
 
-function toggleUnread(id, cmode) {
+function toggleSelected(id) {
        try {
-               if (!xmlhttp_ready(xmlhttp_rpc)) {
-                       printLockingError();
-                       return;
-               }
        
+               var cb = document.getElementById("RCHK-" + id);
+
                var row = document.getElementById("RROW-" + id);
                if (row) {
                        var nc = row.className;
-                       nc = nc.replace("Unread", "");
-                       nc = nc.replace("Selected", "");
+                       
+                       if (!nc.match("Selected")) {
+                               nc = nc + "Selected";
+                               if (cb) {
+                                       cb.checked = true;
+                               }
 
-                       if (row.className.match("Unread")) {
-                               row.className = nc;
+                               // In CDM basically last selected article == active article
+                               if (isCdmMode()) active_post_id = id;
                        } else {
+                               nc = nc.replace("Selected", "");
+                               if (cb) {
+                                       cb.checked = false;
+                               }
+
+                       }
+
+                       row.className = nc;
+               }
+       } catch (e) {
+               exception_error("toggleSelected", e);
+       }
+}
+
+function toggleUnread_afh(effect) {
+       try {
+
+               var elem = effect.element;
+               elem.style.backgroundColor = "";
+
+       } catch (e) {
+               exception_error("toggleUnread_afh", e);
+       }
+} 
+
+function toggleUnread(id, cmode, effect) {
+       try {
+       
+               var row = document.getElementById("RROW-" + id);
+               if (row) {
+                       var nc = row.className;
+                       var is_selected = row.className.match("Selected");
+                       nc = nc.replace("Unread", "");
+                       nc = nc.replace("Selected", "");
+
+                       // since we are removing selection from the object, uncheck
+                       // corresponding checkbox
+
+                       var cb = document.getElementById("RCHK-" + id);
+                       if (cb) {
+                               cb.checked = false;
+                       }
+
+                       // NOTE: I'm not sure that resetting selection here is a feature -fox
+
+                       if (cmode == undefined || cmode == 2) {
+                               if (row.className.match("Unread")) {
+                                       row.className = nc;
+
+                                       if (effect) {
+                                               new Effect.Highlight(row, {duration: 1, startcolor: "#fff7d5",
+                                                       afterFinish: toggleUnread_afh,
+                                                       queue: { position:'end', scope: 'TMRQ-' + id, limit: 1 } } );
+                                       } 
+
+                               } else {
+                                       row.className = nc + "Unread";
+                               }
+                       } else if (cmode == 0) {
+                               row.className = nc;
+
+                               if (effect) {
+                                       new Effect.Highlight(row, {duration: 1, startcolor: "#fff7d5",
+                                               afterFinish: toggleUnread_afh,
+                                               queue: { position:'end', scope: 'TMRQ-' + id, limit: 1 } } );
+                               } 
+                       } else if (cmode == 1) {
                                row.className = nc + "Unread";
                        }
 
-                       if (!cmode) cmode = 2;
+                       // Disable unmarking as selected for the time being (16.05.08) -fox
+                       if (is_selected) row.className = row.className + "Selected";
+
+                       if (cmode == undefined) cmode = 2;
 
                        var query = "backend.php?op=rpc&subop=catchupSelected&ids=" +
                                param_escape(id) + "&cmode=" + param_escape(cmode);
 
-                       notify_progress("Loading, please wait...");
+//                     notify_progress("Loading, please wait...");
 
-                       xmlhttp_rpc.open("GET", query, true);
-                       xmlhttp_rpc.onreadystatechange=all_counters_callback;
-                       xmlhttp_rpc.send(null);
+                       new Ajax.Request(query, {
+                               onComplete: function(transport) { 
+                                       all_counters_callback2(transport); 
+                               } });
 
                }
 
@@ -639,13 +842,78 @@ function toggleUnread(id, cmode) {
        }
 }
 
-function selectionToggleUnread(cdm_mode, set_state, callback_func, no_error) {
+function selectionRemoveLabel(id) {
        try {
-               if (!xmlhttp_ready(xmlhttp_rpc)) {
-                       printLockingError();
+
+               var ids = getSelectedArticleIds2();
+
+               if (ids.length == 0) {
+                       alert(__("No articles are selected."));
                        return;
                }
-       
+
+//             var ok = confirm(__("Remove selected articles from label?"));
+
+//             if (ok) {
+
+                       var query = "backend.php?op=rpc&subop=removeFromLabel&ids=" +
+                               param_escape(ids.toString()) + "&lid=" + param_escape(id);
+
+//                     notify_progress("Loading, please wait...");
+
+                       cache_invalidate("F:" + (-11 - id));
+
+                       new Ajax.Request(query, {
+                               onComplete: function(transport) { 
+                                       show_labels_in_headlines(transport);
+                                       all_counters_callback2(transport);
+                               } });
+
+//             }
+
+       } catch (e) {
+               exception_error("selectionAssignLabel", e);
+
+       }
+}
+
+function selectionAssignLabel(id) {
+       try {
+
+               var ids = getSelectedArticleIds2();
+
+               if (ids.length == 0) {
+                       alert(__("No articles are selected."));
+                       return;
+               }
+
+//             var ok = confirm(__("Assign selected articles to label?"));
+
+//             if (ok) {
+
+                       cache_invalidate("F:" + (-11 - id));
+
+                       var query = "backend.php?op=rpc&subop=assignToLabel&ids=" +
+                               param_escape(ids.toString()) + "&lid=" + param_escape(id);
+
+//                     notify_progress("Loading, please wait...");
+
+                       new Ajax.Request(query, {
+                               onComplete: function(transport) { 
+                                       show_labels_in_headlines(transport);
+                                       all_counters_callback2(transport);
+                               } });
+
+//             }
+
+       } catch (e) {
+               exception_error("selectionAssignLabel", e);
+
+       }
+}
+
+function selectionToggleUnread(cdm_mode, set_state, callback_func, no_error) {
+       try {
                var rows;
 
                if (cdm_mode) {
@@ -699,13 +967,12 @@ function selectionToggleUnread(cdm_mode, set_state, callback_func, no_error) {
                        var query = "backend.php?op=rpc&subop=catchupSelected&ids=" +
                                param_escape(rows.toString()) + "&cmode=" + cmode;
 
-                       _catchup_callback_func = callback_func;
-
                        notify_progress("Loading, please wait...");
 
-                       xmlhttp_rpc.open("GET", query, true);
-                       xmlhttp_rpc.onreadystatechange=catchup_callback;
-                       xmlhttp_rpc.send(null);
+                       new Ajax.Request(query, {
+                               onComplete: function(transport) { 
+                                       catchup_callback2(transport, callback_func); 
+                               } });
 
                }
 
@@ -716,10 +983,6 @@ function selectionToggleUnread(cdm_mode, set_state, callback_func, no_error) {
 
 function selectionToggleMarked(cdm_mode) {
        try {
-               if (!xmlhttp_ready(xmlhttp_rpc)) {
-                       printLockingError();
-                       return;
-               }
        
                var rows;
                
@@ -735,30 +998,7 @@ function selectionToggleMarked(cdm_mode) {
                }
 
                for (i = 0; i < rows.length; i++) {
-                       var row = document.getElementById("RROW-" + rows[i]);
-                       var mark_img = document.getElementById("FMPIC-" + rows[i]);
-
-                       if (row && mark_img) {
-
-                               if (mark_img.alt == "Set mark") {
-                                       mark_img.src = "images/mark_set.png";
-                                       mark_img.alt = "Reset mark";
-                                       //mark_img.setAttribute('onclick', 
-                                       //      'javascript:toggleMark('+rows[i]+', false)');
-               
-                               } else {
-                                       mark_img.src = "images/mark_unset.png";
-                                       mark_img.alt = "Set mark";
-
-                                       //mark_img.alt = "Please wait...";
-
-                                       //mark_img.setAttribute('onclick', 
-                                       //      'javascript:toggleMark('+rows[i]+', true)');
-
-                                       //Effect.Puff(mark_img, {duration : 0.25, afterFinish: tMark_afh_off});
-
-                               }
-                       }
+                       toggleMark(rows[i], true, true);
                }
 
                if (rows.length > 0) {
@@ -768,15 +1008,18 @@ function selectionToggleMarked(cdm_mode) {
 
                        query = query + "&afid=" + getActiveFeedId();
 
-                       if (tagsAreDisplayed()) {
+/*                     if (tagsAreDisplayed()) {
                                query = query + "&omode=tl";
                        } else {
                                query = query + "&omode=flc";
-                       }
+                       } */
 
-                       xmlhttp_rpc.open("GET", query, true);
-                       xmlhttp_rpc.onreadystatechange=all_counters_callback;
-                       xmlhttp_rpc.send(null);
+                       query = query + "&omode=lc";
+
+                       new Ajax.Request(query, {
+                               onComplete: function(transport) { 
+                                       all_counters_callback2(transport); 
+                               } });
 
                }
 
@@ -787,10 +1030,6 @@ function selectionToggleMarked(cdm_mode) {
 
 function selectionTogglePublished(cdm_mode) {
        try {
-               if (!xmlhttp_ready(xmlhttp_rpc)) {
-                       printLockingError();
-                       return;
-               }
        
                var rows;
                
@@ -806,27 +1045,7 @@ function selectionTogglePublished(cdm_mode) {
                }
 
                for (i = 0; i < rows.length; i++) {
-                       var row = document.getElementById("RROW-" + rows[i]);
-                       var mark_img = document.getElementById("FPPIC-" + rows[i]);
-
-                       if (row && mark_img) {
-
-                               if (mark_img.alt == "Publish") {
-                                       mark_img.src = "images/pub_set.png";
-                                       mark_img.alt = "Unpublish";
-//                                     mark_img.setAttribute('onclick', 
-//                                             'javascript:togglePub('+rows[i]+', false)');
-
-                               } else {
-                                       mark_img.src = "images/pub_unset.png";
-                                       mark_img.alt = "Publish";
-//                                     mark_img.setAttribute('onclick', 
-//                                             'javascript:togglePub('+rows[i]+', true)');
-
-//                                     Effect.Puff(mark_img, {duration : 0.25, afterFinish: tPub_afh_off});
-
-                               }
-                       }
+                       togglePub(rows[i], true, true);
                }
 
                if (rows.length > 0) {
@@ -836,15 +1055,18 @@ function selectionTogglePublished(cdm_mode) {
 
                        query = query + "&afid=" + getActiveFeedId();
 
-                       if (tagsAreDisplayed()) {
+/*                     if (tagsAreDisplayed()) {
                                query = query + "&omode=tl";
                        } else {
                                query = query + "&omode=flc";
-                       }
+                       } */
+
+                       query = query + "&omode=lc";
 
-                       xmlhttp_rpc.open("GET", query, true);
-                       xmlhttp_rpc.onreadystatechange=all_counters_callback;
-                       xmlhttp_rpc.send(null);
+                       new Ajax.Request(query, {
+                               onComplete: function(transport) { 
+                                       all_counters_callback2(transport); 
+                               } });
 
                }
 
@@ -860,7 +1082,7 @@ function cdmGetSelectedArticles() {
        for (i = 0; i < container.childNodes.length; i++) {
                var child = container.childNodes[i];
 
-               if (child.id.match("RROW-") && child.className.match("Selected")) {
+               if (child.id && child.id.match("RROW-") && child.className.match("Selected")) {
                        var c_id = child.id.replace("RROW-", "");
                        sel_articles.push(c_id);
                }
@@ -869,6 +1091,41 @@ function cdmGetSelectedArticles() {
        return sel_articles;
 }
 
+function cdmGetVisibleArticles() {
+       var sel_articles = new Array();
+       var container = document.getElementById("headlinesInnerContainer");
+
+       if (!container) return sel_articles;
+
+       for (i = 0; i < container.childNodes.length; i++) {
+               var child = container.childNodes[i];
+
+               if (child.id && child.id.match("RROW-")) {
+                       var c_id = child.id.replace("RROW-", "");
+                       sel_articles.push(c_id);
+               }
+       }
+
+       return sel_articles;
+}
+
+function cdmGetUnreadArticles() {
+       var sel_articles = new Array();
+       var container = document.getElementById("headlinesInnerContainer");
+
+       for (i = 0; i < container.childNodes.length; i++) {
+               var child = container.childNodes[i];
+
+               if (child.id && child.id.match("RROW-") && child.className.match("Unread")) {
+                       var c_id = child.id.replace("RROW-", "");
+                       sel_articles.push(c_id);
+               }
+       }
+
+       return sel_articles;
+}
+
+
 // mode = all,none,unread
 function cdmSelectArticles(mode) {
        var container = document.getElementById("headlinesInnerContainer");
@@ -876,7 +1133,7 @@ function cdmSelectArticles(mode) {
        for (i = 0; i < container.childNodes.length; i++) {
                var child = container.childNodes[i];
 
-               if (child.id.match("RROW-")) {
+               if (child.id && child.id.match("RROW-")) {
                        var aid = child.id.replace("RROW-", "");
 
                        var cb = document.getElementById("RCHK-" + aid);
@@ -901,7 +1158,7 @@ function cdmSelectArticles(mode) {
 
 function catchupPage() {
 
-       var fn = getFeedName(getActiveFeedId(), active_feed_is_cat);
+       var fn = getFeedName(getActiveFeedId(), activeFeedIsCat());
        
        var str = __("Mark all visible articles in %s as read?");
 
@@ -940,10 +1197,11 @@ function catchupSelection() {
                }
        
        
-               var fn = getFeedName(getActiveFeedId(), active_feed_is_cat);
+               var fn = getFeedName(getActiveFeedId(), activeFeedIsCat());
                
-               var str = __("Mark all selected articles in %s as read?");
+               var str = __("Mark %d selected articles in %s as read?");
        
+               str = str.replace("%d", rows.length);
                str = str.replace("%s", fn);
        
                if (getInitParam("confirm_feed_catchup") == 1 && !confirm(str)) {
@@ -963,79 +1221,45 @@ function catchupSelection() {
        }
 }
 
-
-function labelFromSearch(search, search_mode, match_on, feed_id, is_cat) {
-
-       if (!xmlhttp_ready(xmlhttp_rpc)) {
-               printLockingError();
-       }
-
-       var title = prompt(__("Please enter label title:"), "");
-
-       if (title) {
-
-               var query = "backend.php?op=labelFromSearch&search=" + param_escape(search) +
-                       "&smode=" + param_escape(search_mode) + "&match=" + param_escape(match_on) +
-                       "&feed=" + param_escape(feed_id) + "&is_cat=" + param_escape(is_cat) + 
-                       "&title=" + param_escape(title);
-
-               debug("LFS: " + query);
-       
-               xmlhttp_rpc.open("GET", query, true);
-               xmlhttp_rpc.onreadystatechange=dlg_frefresh_callback;
-               xmlhttp_rpc.send(null);
-       }
-
-}
-
 function editArticleTags(id, feed_id, cdm_enabled) {
-       _tag_active_post_id = id;
-       _tag_active_feed_id = feed_id;
-       _tag_active_cdm = cdm_enabled;
+       displayDlg('editArticleTags', id);
+}
 
-       cache_invalidate(id);
 
+function tag_saved_callback(transport) {
        try {
-               _tag_cdm_scroll = document.getElementById("headlinesInnerContainer").scrollTop;
-       } catch (e) { }
-       displayDlg('editArticleTags', id);
-}
+               debug("in tag_saved_callback");
 
+               closeInfoBox();
+               notify("");
 
-function tag_saved_callback() {
-       if (xmlhttp_rpc.readyState == 4) {
-               try {
-                       debug("in tag_saved_callback");
+               if (tagsAreDisplayed()) {
+                       _reload_feedlist_after_view = true;
+               }
 
-                       closeInfoBox();
-                       notify("");
 
-                       if (tagsAreDisplayed()) {
-                               _reload_feedlist_after_view = true;
-                       }
+               if (transport.responseXML) {
+                       var tags_str = transport.responseXML.getElementsByTagName("tags-str")[0];
+                       
+                       if (tags_str) {
+                               var id = tags_str.getAttribute("id");
 
-                       if (!_tag_active_cdm) {
-                               if (active_post_id == _tag_active_post_id) {
-                                       debug("reloading current article");
-                                       view(_tag_active_post_id, _tag_active_feed_id);                 
+                               if (id) {
+                                       var tags = document.getElementById("ATSTR-" + id);
+                                       if (tags) {
+                                               tags.innerHTML = tags_str.firstChild.nodeValue;
+                                       }
                                }
-                       } else {
-                               debug("reloading current feed");
-                               viewCurrentFeed();
                        }
-
-               } catch (e) {
-                       exception_error("catchup_callback", e);
                }
+
+       } catch (e) {
+               exception_error("tag_saved_callback", e);
        }
 }
 
 function editTagsSave() {
 
-       if (!xmlhttp_ready(xmlhttp_rpc)) {
-               printLockingError();
-       }
-
        notify_progress("Saving article tags...");
 
        var form = document.forms["tag_edit_form"];
@@ -1046,9 +1270,10 @@ function editTagsSave() {
 
        debug(query);
 
-       xmlhttp_rpc.open("GET", query, true);                   
-       xmlhttp_rpc.onreadystatechange=tag_saved_callback;
-       xmlhttp_rpc.send(null);
+       new Ajax.Request(query, {
+               onComplete: function(transport) {
+                               tag_saved_callback(transport);
+                       } });
 
 }
 
@@ -1073,7 +1298,105 @@ function editTagsInsert() {
                found_tags.selectedIndex = 0;
                
        } catch (e) {
-               exception_error(e, "editTagsInsert");
+               exception_error("editTagsInsert", e);
+       }
+}
+
+function cdmScrollViewport(where) {
+       debug("cdmScrollViewport: " + where);
+
+       var ctr = document.getElementById("headlinesInnerContainer");
+
+       if (!ctr) return;
+
+       if (where == "bottom") {
+               ctr.scrollTop = ctr.scrollHeight;
+       } else {
+               ctr.scrollTop = where;
+       }
+}
+
+function cdmArticleIsBelowViewport(id) {
+       try {
+               var ctr = document.getElementById("headlinesInnerContainer");
+               var e = document.getElementById("RROW-" + id);
+
+               if (!e || !ctr) return;
+
+               // article starts below viewport
+
+               if (ctr.scrollTop < e.offsetTop) {
+                       return true;
+               } else {        
+                       return false;
+               }
+
+       } catch (e) {
+               exception_error("cdmArticleIsVisible", e);
+       }
+}
+
+function cdmArticleIsAboveViewport(id) {
+       try {
+               var ctr = document.getElementById("headlinesInnerContainer");
+               var e = document.getElementById("RROW-" + id);
+
+               if (!e || !ctr) return;
+
+               // article starts above viewport
+
+               if (ctr.scrollTop > e.offsetTop + e.offsetHeight) {
+                       return true;
+               } else {        
+                       return false;
+               }
+
+       } catch (e) {
+               exception_error("cdmArticleIsVisible", e);
+       }
+}
+
+function cdmScrollToArticleId(id) {
+       try {
+               var ctr = document.getElementById("headlinesInnerContainer");
+               var e = document.getElementById("RROW-" + id);
+
+               if (!e || !ctr) return;
+
+               ctr.scrollTop = e.offsetTop;
+
+       } catch (e) {
+               exception_error("cdmScrollToArticleId", e);
+       }
+}
+
+function cdmArticleIsActuallyVisible(id) {
+       try {
+               var ctr = document.getElementById("headlinesInnerContainer");
+               var e = document.getElementById("RROW-" + id);
+
+               if (!e || !ctr) return;
+
+               // article fits in viewport OR article is longer than viewport and
+               // its bottom is visible
+
+               if (ctr.scrollTop <= e.offsetTop && e.offsetTop + e.offsetHeight <=
+                               ctr.scrollTop + ctr.offsetHeight) {
+
+                       return true;
+               
+               } else if (e.offsetHeight > ctr.offsetHeight &&
+                               e.offsetTop + e.offsetHeight >= ctr.scrollTop &&
+                               e.offsetTop + e.offsetHeight <= ctr.scrollTop + ctr.offsetHeight) {
+
+                       return true;
+
+               }
+
+               return false;
+
+       } catch (e) {
+               exception_error("cdmArticleIsVisible", e);
        }
 }
 
@@ -1129,7 +1452,7 @@ function cdmWatchdog() {
 
                debug("cdmWatchdog, ids= " + ids.toString());
 
-               if (ids.length > 0 && xmlhttp_ready(xmlhttp_rpc)) {
+               if (ids.length > 0) {
 
                        for (var i = 0; i < ids.length; i++) {
                                var e = document.getElementById("RROW-" + ids[i]);
@@ -1141,34 +1464,36 @@ function cdmWatchdog() {
                        var query = "backend.php?op=rpc&subop=catchupSelected&ids=" +
                                param_escape(ids.toString()) + "&cmode=0";
 
-                       xmlhttp_rpc.open("GET", query, true);
-                       xmlhttp_rpc.onreadystatechange=all_counters_callback;
-                       xmlhttp_rpc.send(null); 
+                       new Ajax.Request(query, {
+                               onComplete: function(transport) { 
+                                       all_counters_callback2(transport); 
+                               } });
 
                }
 
                _cdm_wd_timeout = window.setTimeout("cdmWatchdog()", 4000);
 
        } catch (e) {
-               exception_error(e, "cdmWatchdog");
+               exception_error("cdmWatchdog", e);
        }
 
 }
 
 
-function cache_inject(id, article) {
-       if (!cache_check(id)) {
-               debug("cache_article: miss: " + id);
+function cache_inject(id, article, param) {
+       if (!cache_check_param(id, param)) {
+               debug("cache_article: miss: " + id + " [p=" + param + "]");
 
                var cache_obj = new Array();
 
                cache_obj["id"] = id;
                cache_obj["data"] = article;
+               cache_obj["param"] = param;
 
                article_cache.push(cache_obj);
 
        } else {
-               debug("cache_article: hit: " + id);
+               debug("cache_article: hit: " + id + " [p=" + param + "]");
        }
 }
 
@@ -1181,6 +1506,15 @@ function cache_find(id) {
        return false;
 }
 
+function cache_find_param(id, param) {
+       for (var i = 0; i < article_cache.length; i++) {
+               if (article_cache[i]["id"] == id && article_cache[i]["param"] == param) {
+                       return article_cache[i]["data"];
+               }
+       }
+       return false;
+}
+
 function cache_check(id) {
        for (var i = 0; i < article_cache.length; i++) {
                if (article_cache[i]["id"] == id) {
@@ -1190,12 +1524,29 @@ function cache_check(id) {
        return false;
 }
 
+function cache_check_param(id, param) {
+       for (var i = 0; i < article_cache.length; i++) {
+
+//             debug("cache_check_param " + article_cache[i]["id"] + ":" + 
+//                     article_cache[i]["param"] + " vs " + id + ":" + param);
+
+               if (article_cache[i]["id"] == id && article_cache[i]["param"] == param) {
+                       return true;
+               }
+       }
+       return false;
+}
+
 function cache_expire() {
-       while (article_cache.length > 20) {
+       while (article_cache.length > 25) {
                article_cache.shift();
        }
 }
 
+function cache_empty() {
+       article_cache = new Array();
+}
+
 function cache_invalidate(id) {
        var i = 0
 
@@ -1220,20 +1571,97 @@ function getActiveArticleId() {
        return active_post_id;
 }
 
-function cdmMouseIn(elem) {
+function cdmClicked(id) {
        try {
-               if (elem.id && elem.id.match("RROW-")) {
+               var elem = document.getElementById("RROW-" + id);
+
+               if (elem) {
                        var id = elem.id.replace("RROW-", "");
                        active_post_id = id;
+
+                       cdmSelectArticles("none");
+                       toggleUnread(id, 0, true);
+                       toggleSelected(id);
+
+               }
+       } catch (e) {
+               exception_error("cdmClicked", e);
+       } 
+}
+
+function preload_article_callback(transport) {
+       try {
+               if (transport.responseXML) {
+                       var articles = transport.responseXML.getElementsByTagName("article");
+
+                       for (var i = 0; i < articles.length; i++) {
+                               var id = articles[i].getAttribute("id");
+                               if (!cache_check(id)) {
+                                       cache_inject(id, articles[i].firstChild.nodeValue);                             
+                                       debug("preloaded article: " + id);
+                               }
+                       }
+               }
+       } catch (e) {
+               exception_error("preload_article_callback", e);
+       }
+}
+
+function preloadArticleUnderPointer(id) {
+       try {
+               if (getInitParam("bw_limit") == "1") return;
+
+               if (post_under_pointer == id && !cache_check(id)) {
+
+                       debug("trying to preload article " + id);
+
+                       var neighbor_ids = getRelativePostIds(id, 1);
+
+                       /* only request uncached articles */
+
+                       var cids_to_request = Array();
+
+                       for (var i = 0; i < neighbor_ids.length; i++) {
+                               if (!cache_check(neighbor_ids[i])) {
+                                       cids_to_request.push(neighbor_ids[i]);
+                               }
+                       }
+                       debug("additional ids: " + cids_to_request.toString());
+
+                       cids_to_request.push(id);
+
+                       var query = "backend.php?op=rpc&subop=getArticles&ids=" + 
+                               cids_to_request.toString();
+                       new Ajax.Request(query, {
+                               onComplete: function(transport) { 
+                                       preload_article_callback(transport);
+                       } });
                }
        } catch (e) {
-               exception_error("cdmMouseIn", e);
+               exception_error("preloadArticleUnderPointer", e);
        }
+}
+
+function postMouseIn(id) {
+       try {
+               if (post_under_pointer != id) {
+                       post_under_pointer = id;
+                       if (!isCdmMode()) {
+                               window.setTimeout("preloadArticleUnderPointer(" + id + ")", 250);
+                       }
+               }
 
+       } catch (e) {
+               exception_error("postMouseIn", e);
+       }
 }
 
-function cdmMouseOut(elem) {
-       active_post_id = false;
+function postMouseOut(id) {
+       try {
+               post_under_pointer = false;
+       } catch (e) {
+               exception_error("postMouseOut", e);
+       }
 }
 
 function headlines_scroll_handler() {
@@ -1241,13 +1669,343 @@ function headlines_scroll_handler() {
 
                var e = document.getElementById("headlinesInnerContainer");
 
-               if (e.scrollTop + e.offsetHeight > e.scrollHeight - 300) {
-                       debug("more cowbell!");
+               // don't do infinite scrolling when Limit == All
+
+               var toolbar_form = document.forms["main_toolbar_form"];
 
-                       viewNextFeedPage();
+               var limit = toolbar_form.limit[toolbar_form.limit.selectedIndex];
+               if (limit.value != 0) {
+               
+                       debug((e.scrollTop + e.offsetHeight) + " vs " + e.scrollHeight + " dis? " +
+                               _infscroll_disable);
+
+                       if (e.scrollTop + e.offsetHeight > e.scrollHeight - 100) {
+                               if (!_infscroll_disable) {
+                                       debug("more cowbell!");
+                                       viewNextFeedPage();
+                               }
+                       }
                }
 
        } catch (e) {
                exception_error("headlines_scroll_handler", e);
        }
 }
+
+function catchupRelativeToArticle(below) {
+
+       try {
+
+               if (!xmlhttp_ready(xmlhttp_rpc)) {
+                       printLockingError();
+               }
+       
+               if (!getActiveArticleId()) {
+                       alert(__("No article is selected."));
+                       return;
+               }
+
+               var visible_ids;
+
+               if (document.getElementById("headlinesList")) {
+                       visible_ids = getVisibleHeadlineIds();
+               } else {
+                       visible_ids = cdmGetVisibleArticles();
+               }
+
+               var ids_to_mark = new Array();
+
+               if (!below) {
+                       for (var i = 0; i < visible_ids.length; i++) {
+                               if (visible_ids[i] != getActiveArticleId()) {
+                                       var e = document.getElementById("RROW-" + visible_ids[i]);
+
+                                       if (e && e.className.match("Unread")) {
+                                               ids_to_mark.push(visible_ids[i]);
+                                       }
+                               } else {
+                                       break;
+                               }
+                       }
+               } else {
+                       for (var i = visible_ids.length-1; i >= 0; i--) {
+                               if (visible_ids[i] != getActiveArticleId()) {
+                                       var e = document.getElementById("RROW-" + visible_ids[i]);
+
+                                       if (e && e.className.match("Unread")) {
+                                               ids_to_mark.push(visible_ids[i]);
+                                       }
+                               } else {
+                                       break;
+                               }
+                       }
+               }
+
+               if (ids_to_mark.length == 0) {
+                       alert(__("No articles found to mark"));
+               } else {
+                       var msg = __("Mark %d article(s) as read?").replace("%d", ids_to_mark.length);
+
+                       if (confirm(msg)) {
+
+                               for (var i = 0; i < ids_to_mark.length; i++) {
+                                       var e = document.getElementById("RROW-" + ids_to_mark[i]);
+                                       e.className = e.className.replace("Unread", "");
+                               }
+
+                               var query = "backend.php?op=rpc&subop=catchupSelected&ids=" +
+                                       param_escape(ids_to_mark.toString()) + "&cmode=0";
+
+                               new Ajax.Request(query, {
+                                       onComplete: function(transport) { 
+                                               catchup_callback2(transport); 
+                                       } });
+
+                       }
+               }
+
+       } catch (e) {
+               exception_error("catchupRelativeToArticle", e);
+       }
+}
+
+function cdmExpandArticle(a_id) {
+       try {
+               var id = 'CICD-' + a_id;
+
+               try {
+                       Element.hide("CEXC-" + a_id);
+               } catch (e) { } 
+
+               Effect.Appear(id, {duration : 0.5, 
+                       beforeStart: function(effect) { 
+                               var h_id = 'CICH-' + a_id;
+                               var h_elem = document.getElementById(h_id);
+                               if (h_elem) { h_elem.style.display = "none"; }
+
+                               toggleUnread(a_id, 0);
+                       }});
+
+
+       } catch (e) {
+               exception_error("appearBlockElementF", e);
+       }
+
+}
+
+function fixHeadlinesOrder(ids) {
+       try {
+               for (var i = 0; i < ids.length; i++) {
+                       var e = document.getElementById("RROW-" + ids[i]);
+
+                       if (e) {
+                               if (i % 2 == 0) {
+                                       e.className = e.className.replace("even", "odd");
+                               } else {
+                                       e.className = e.className.replace("odd", "even");
+                               }
+                       }
+               }
+       } catch (e) {
+               exception_error("fixHeadlinesOrder", e);
+       }
+}
+
+function hideReadHeadlines() {
+       try {
+
+               var ids = false;
+               var vis_ids = new Array();
+
+               if (document.getElementById("headlinesList")) {
+                       ids = getVisibleHeadlineIds();
+               } else {
+                       ids = cdmGetVisibleArticles();
+               }
+
+               var read_headlines_visible = true;
+
+               for (var i = 0; i < ids.length; i++) {
+                       var row = document.getElementById("RROW-" + ids[i]);
+
+                       if (row && row.className) {
+                               if (read_headlines_visible) {
+                                       if (row.className.match("Unread") || row.className.match("Selected")) {
+                                               Element.show(row);
+                                               vis_ids.push(ids[i]);
+                                       } else {
+                                               //Effect.Fade(row, {duration : 0.3});
+                                               Element.hide(row);
+                                       }
+                               } else {
+                                       Element.show(row);
+                                       vis_ids.push(ids[i]);
+                               }
+                       }
+               }
+               
+               fixHeadlinesOrder(vis_ids);
+
+               read_headlines_visible = !read_headlines_visible;
+
+       } catch (e) {
+               exception_error("hideReadHeadlines", e);
+       } 
+}
+
+function invertHeadlineSelection() {
+       try {
+               var rows = new Array();
+               var r = false;
+               
+               if (!isCdmMode()) {             
+                       r = document.getElementsByTagName("TR");
+               } else {
+                       r = document.getElementsByTagName("DIV");
+               }
+
+               for (var i = 0; i < r.length; i++) {
+                       if (r[i].id && r[i].id.match("RROW-")) {
+                               rows.push(r[i]);
+                       }
+               }
+               
+               for (var i = 0; i < rows.length; i++) {
+                       var nc = rows[i].className;
+                       var id = rows[i].id.replace("RROW-", "");
+                       var cb = document.getElementById("RCHK-" + id);
+
+                       if (!rows[i].className.match("Selected")) {
+                               nc = nc + "Selected";
+                               cb.checked = true;
+                       } else {
+                               nc = nc.replace("Selected", "");
+                               cb.checked = false;
+                       }
+
+                       rows[i].className = nc;
+
+               }
+
+       } catch (e) {
+               exception_error("invertHeadlineSelection", e);
+       }
+}
+
+function getArticleUnderPointer() {
+       return post_under_pointer;
+}
+
+function zoomToArticle(id) {
+       try {
+               var w = window.open("backend.php?op=view&mode=zoom&id=" + param_escape(id), 
+                       "ttrss_zoom_" + id,
+                       "status=0,toolbar=0,location=0,width=450,height=300,scrollbars=1,menubar=0");
+
+       } catch (e) {
+               exception_error("zoomToArticle", e);
+       }
+}
+
+function showOriginalArticleInline(id) {
+       try {
+
+               var query = "backend.php?op=rpc&subop=getArticleLink&id=" + id;
+
+               notify_progress("Loading, please wait...", true);
+
+               new Ajax.Request(query, {
+                       onComplete: function(transport) { 
+
+                               if (transport.responseXML) {
+                       
+                                       var link = transport.responseXML.getElementsByTagName("link")[0];
+                                       var id = transport.responseXML.getElementsByTagName("id")[0];
+
+                                       notify("");
+
+                                       if (link && id) {
+                                               link = link.firstChild.nodeValue;
+
+                                               var ci = document.getElementById("content-insert");
+
+                                               var tmp = "<iframe id=\"inline_orig_article\" width=\""+ci.offsetWidth+"\" height=\""+ci.offsetHeight+"\" style=\"border-width : 0px;\" src=\""+link+"\"></iframe>";
+
+                                               render_article(tmp);
+
+                                       }
+                               }
+                       } });
+
+       } catch (e) {
+               exception_error("showOriginalArticleInline", e);
+       }
+}
+
+
+function scrollArticle(offset) {
+       try {
+               if (!isCdmMode()) {
+                       var ci = document.getElementById("content-insert");
+                       if (ci) {
+                               ci.scrollTop += offset;
+                       }
+               } else {
+                       var hi = document.getElementById("headlinesInnerContainer");
+                       if (hi) {
+                               hi.scrollTop += offset;
+                       }
+
+               }
+       } catch (e) {
+               exception_error("scrollArticle", e);
+       }
+}
+
+function show_labels_in_headlines(transport) {
+       try {
+               if (transport.responseXML) {
+                       var info = transport.responseXML.getElementsByTagName("info-for-headlines")[0];
+
+                       var elems = info.getElementsByTagName("entry");
+
+                       for (var l = 0; l < elems.length; l++) {
+                               var e_id = elems[l].getAttribute("id");
+
+                               if (e_id) {
+
+                                       var ctr = document.getElementById("HLLCTR-" + e_id);
+
+                                       if (ctr) {
+                                               ctr.innerHTML = elems[l].firstChild.nodeValue;
+                                       }
+                               }
+
+                       }
+
+               }
+       } catch (e) {
+               exception_error("show_labels_in_headlines", e);
+
+       }
+}
+
+function toggleHeadlineActions() {
+       try {
+               var e = document.getElementById("headlineActionsBody");
+               var p = document.getElementById("headlineActionsDrop");
+
+               if (!Element.visible(e)) {
+                       Element.show(e);
+               } else {
+                       Element.hide(e);
+               }
+
+               e.scrollTop = 0;
+               e.style.left = (p.offsetLeft + 1) + "px";
+//             e.style.top = (p.offsetTop + p.offsetHeight - 1) + "px";
+
+       } catch (e) {
+               exception_error("toggleHeadlineActions", e);
+       }
+}