]> git.wh0rd.org - tt-rss.git/blobdiff - viewfeed.js
update cache when viewing unread articles
[tt-rss.git] / viewfeed.js
index 7ff660a3bfd7c8061f0af1c1a4cda664f03e934a..4f40f8fb3757bf3281dfa2ee4a8ff4fb303739c9 100644 (file)
@@ -1,5 +1,4 @@
 var active_post_id = false;
-var _catchup_callback_func = false;
 var last_article_view = false;
 var active_real_feed_id = false;
 
@@ -16,60 +15,309 @@ var _reload_feedlist_after_view = false;
 var _cdm_wd_timeout = false;
 var _cdm_wd_vishist = new Array();
 
+var article_cache = new Array();
+
 function catchup_callback() {
        if (xmlhttp_rpc.readyState == 4) {
                try {
                        debug("catchup_callback");
+                       notify("");                     
+                       all_counters_callback2(xmlhttp_rpc);
                        if (_catchup_callback_func) {
-                               setTimeout(_catchup_callback_func, 100);        
+                               setTimeout(_catchup_callback_func, 10); 
                        }
-                       all_counters_callback();
                } catch (e) {
                        exception_error("catchup_callback", e);
                }
        }
 }
 
-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);
+       }
+}
+
+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", "");
+                       }                       
+               }
+       } catch (e) {
+               exception_error("clean_feed_selections", e);
+       }
+}
+
+function headlines_callback2(transport, active_feed_id, is_cat, feed_cur_page) {
+       try {
+
+               debug("headlines_callback2 [page=" + feed_cur_page + "]");
+
+               clean_feed_selections();
+
+               setActiveFeedId(active_feed_id);
+               
+               if (is_cat != undefined) {
+                       active_feed_is_cat = is_cat;
+               }
+       
+               if (!is_cat) {
+                       var feedr = document.getElementById("FEEDR-" + active_feed_id);
+                       if (feedr && !feedr.className.match("Selected")) {      
+                               feedr.className = feedr.className + "Selected";
+                       } 
+               }
+       
                var f = document.getElementById("headlines-frame");
                try {
-                       f.scrollTop = 0;
+                       if (feed_cur_page == 0) { 
+                               debug("resetting headlines scrollTop");
+                               f.scrollTop = 0; 
+                       }
                } catch (e) { };
-               f.innerHTML = xmlhttp.responseText;
-               update_all_counters();
+       
+               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 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 (headlines_count == 0) _infscroll_disable = 1;
+       
+                       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 + active_feed_id);
+
+                                       if (!disable_cache) {
+                                               cache_inject(cache_prefix + active_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>";
+       
+                               }
+                       } else {
+                               if (headlines) {
+                                       if (headlines_count > 0) {
+                                               debug("adding some more headlines...");
+       
+                                               var c = document.getElementById("headlinesList");
+               
+                                               if (!c) {
+                                                       c = document.getElementById("headlinesInnerContainer");
+                                               }
+
+                                               var ids = getSelectedArticleIds2();
+       
+                                               c.innerHTML = c.innerHTML + headlines.firstChild.nodeValue;
+
+                                               debug("restore selected ids: " + ids);
+
+                                               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");
+                                       debug("found id: " + a_id);
+                                       cache_inject(a_id, articles[i].firstChild.nodeValue);
+                               }
+                       } 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");
+                       }
+       
+                       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")) {
+       
+               if (!document.getElementById("headlinesList") && 
+                               getInitParam("cdm_auto_catchup") == 1) {
                        debug("starting CDM watchdog");
                        _cdm_wd_timeout = window.setTimeout("cdmWatchdog()", 5000);
                        _cdm_wd_vishist = new Array();
+               } else {
+                       debug("not in CDM mode or watchdog disabled");
                }
-
+       
                if (_tag_cdm_scroll) {
                        try {
                                document.getElementById("headlinesInnerContainer").scrollTop = _tag_cdm_scroll;
                                _tag_cdm_scroll = false;
+                               debug("resetting headlinesInner scrollTop");
+       
                        } catch (e) { }
                }
+       
+               _feed_cur_page = feed_cur_page;
+               _infscroll_request_sent = 0;
 
                notify("");
+       } catch (e) {
+               exception_error("headlines_callback2", e);
        }
 }
 
-function article_callback() {
-       if (xmlhttp.readyState == 4) {
-               debug("article_callback");
+function render_article(article) {
+       try {
                var f = document.getElementById("content-frame");
                try {
                        f.scrollTop = 0;
                } catch (e) { };
-               f.innerHTML = xmlhttp.responseText;
+
+               f.innerHTML = article;
+
+       } catch (e) {
+               exception_error("render_article", e);
+       }
+}
+
+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);
+               markHeadline(id);
+       
+               var upd_img_pic = document.getElementById("FUPDPIC-" + id);
+
+               var cache_prefix = "";
+                               
+               if (activeFeedIsCat()) {
+                       cache_prefix = "C:";
+               } else {
+                       cache_prefix = "F:";
+               }
+       
+               if (upd_img_pic && upd_img_pic.src.match("updated.png")) {
+                       upd_img_pic.src = "images/blank_icon.gif";
+
+                       cache_invalidate(cache_prefix + getActiveFeedId());
+
+                       cache_inject(cache_prefix + getActiveFeedId(),
+                               document.getElementById("headlines-frame").innerHTML,
+                               get_feed_unread(getActiveFeedId()));
+
+               } else if (article_is_unread) {
+
+                       cache_invalidate(cache_prefix + getActiveFeedId());
+
+                       cache_inject(cache_prefix + getActiveFeedId(),
+                               document.getElementById("headlines-frame").innerHTML,
+                               get_feed_unread(getActiveFeedId())-1);
+
+               }
+
+       } catch (e) {
+               exception_error("showArticleInHeadlines", e);
+       }
+}
+
+function article_callback2(transport, id, feed_id) {
+       try {
+               debug("article_callback2 " + id);
+
+               if (transport.responseXML) {
+
+                       active_real_feed_id = feed_id;
+                       active_post_id = id; 
+
+                       showArticleInHeadlines(id);     
+
+                       var reply = transport.responseXML.firstChild.firstChild;
+
+                       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);
+                               }
+
+                               cache_inject(a_id, 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>";
+               }
 
                var date = new Date();
                last_article_view = date.getTime() / 1000;
@@ -82,8 +330,19 @@ function article_callback() {
                        setTimeout('updateFeedList(false, false)', 50);                 
                        _reload_feedlist_after_view = false;
                } else {
-                       update_all_counters();
+                       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");
+                       }
                }
+
+               notify("");
+       } catch (e) {
+               exception_error("article_callback2", e);
        }
 }
 
@@ -91,16 +350,13 @@ function view(id, feed_id, skip_history) {
        
        try {
                debug("loading article: " + id + "/" + feed_id);
+       
+               var cached_article = cache_find(id);
 
-               active_real_feed_id = feed_id;
-
-               if (!skip_history) {
-                       history_push("ARTICLE:" + id + ":" + feed_id);
-               }
+               debug("cache check result: " + (cached_article != false));
        
                enableHotkeys();
        
-               active_post_id = id; 
                //setActiveFeedId(feed_id);
 
                var query = "backend.php?op=view&id=" + param_escape(id) +
@@ -108,95 +364,292 @@ 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();
+               var neighbor_ids = getRelativePostIds(active_post_id);
+
+               /* 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());                 
+
+               /* additional info for piggyback counters */
+
+               if (tagsAreDisplayed()) {
+                       query = query + "&omode=lt";
+               } else {
+                       query = query + "&omode=flc";
                }
 
-               if (xmlhttp_ready(xmlhttp)) {
+               var date = new Date();
+               var timestamp = Math.round(date.getTime() / 1000);
+               query = query + "&ts=" + timestamp;
 
-                       cleanSelected("headlinesList");
+               query = query + "&cids=" + cids_to_request.toString();
 
-                       var crow = document.getElementById("RROW-" + active_post_id);
-                       crow.className = crow.className.replace("Unread", "");
+               var crow = document.getElementById("RROW-" + id);
+               var article_is_unread = crow.className.match("Unread");
 
-                       var upd_img_pic = document.getElementById("FUPDPIC-" + active_post_id);
+               showArticleInHeadlines(id);
 
-                       if (upd_img_pic) {
-                               upd_img_pic.src = "images/blank_icon.gif";
-                       }
+               if (!cached_article) {
 
-                       selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', false);
-                       markHeadline(active_post_id);
+                       notify_progress("Loading, please wait...");
 
-                       var date = new Date();
-                       var timestamp = Math.round(date.getTime() / 1000);
-                       query = query + "&ts=" + timestamp
+               } else if (cached_article && article_is_unread) {
 
-                       xmlhttp.open("GET", query, true);
-                       xmlhttp.onreadystatechange=article_callback;
-                       xmlhttp.send(null);
-               } else {
-                       debug("xmlhttp busy (@view)");
-                       printLockingError();
-               }  
+                       query = query + "&mode=prefetch";
+
+                       render_article(cached_article);
+
+               } else if (cached_article) {
+
+                       query = query + "&mode=prefetch_old";
+                       render_article(cached_article);
+               }
+
+               cache_expire();
+
+               new Ajax.Request(query, {
+                       onComplete: function(transport) { 
+                               article_callback2(transport, id, feed_id); 
+                       } });
 
        } catch (e) {
                exception_error("view", e);
        }
 }
 
-function toggleMark(id) {
+function tMark(id) {
+       return toggleMark(id);
+}
 
-       if (!xmlhttp_ready(xmlhttp_rpc)) {
-               printLockingError();
-               return;
+function tPub(id) {
+       return togglePub(id);
+}
+
+function tMark_afh_off(effect) {
+       try {
+               var elem = effect.effects[0].element;
+
+               debug("tMark_afh_off : " + elem.id);
+
+               if (elem) {
+                       elem.src = elem.src.replace("mark_set", "mark_unset");
+                       elem.alt = __("Star article");
+                       Element.show(elem);
+               }
+
+       } catch (e) {
+               exception_error("tMark_afh_off", e);
        }
+}
+
+function tPub_afh_off(effect) {
+       try {
+               var elem = effect.effects[0].element;
+
+               debug("tPub_afh_off : " + elem.id);
+
+               if (elem) {
+                       elem.src = elem.src.replace("pub_set", "pub_unset");
+                       elem.alt = __("Publish article");
+                       Element.show(elem);
+               }
 
-       var query = "backend.php?op=rpc&id=" + id + "&subop=mark";
+       } catch (e) {
+               exception_error("tPub_afh_off", e);
+       }
+}
 
-       var mark_img = document.getElementById("FMARKPIC-" + id);
-       var vfeedu = document.getElementById("FEEDU--1");
-       var crow = document.getElementById("RROW-" + id);
+function toggleMark(id, client_only, no_effects) {
 
-       if (mark_img.alt != "Reset mark") {
-               mark_img.src = "images/mark_set.png";
-               mark_img.alt = "Reset mark";
-               query = query + "&mark=1";
+       try {
 
-               if (vfeedu && crow.className.match("Unread")) {
-                       vfeedu.innerHTML = (+vfeedu.innerHTML) + 1;
+               var query = "backend.php?op=rpc&id=" + id + "&subop=mark";
+       
+               query = query + "&afid=" + getActiveFeedId();
+       
+               if (tagsAreDisplayed()) {
+                       query = query + "&omode=tl";
+               } else {
+                       query = query + "&omode=flc";
+               }
+       
+               var mark_img = document.getElementById("FMPIC-" + id);
+               var vfeedu = document.getElementById("FEEDU--1");
+               var crow = document.getElementById("RROW-" + id);
+       
+               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...");
+                       query = query + "&mark=0";
+       
+/*                     if (vfeedu && crow.className.match("Unread")) {
+                               vfeedu.innerHTML = (+vfeedu.innerHTML) - 1;
+                       } */
+       
+                       if (document.getElementById("headlinesList") && !no_effects) {
+                               Effect.Puff(mark_img, {duration : 0.25, afterFinish: tMark_afh_off});
+                       } else { 
+                               mark_img.src = mark_img.src.replace("mark_set", "mark_unset");
+                               mark_img.alt = __("Star article");
+                       }
                }
+       
+/*             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", "");
+                       }
+               }
+       
+               debug("toggle starred for aid " + id);
+       
+               //new Ajax.Request(query); */
 
-       } else {
-               mark_img.src = "images/mark_unset.png";
-               mark_img.alt = "Set mark";
-               query = query + "&mark=0";
+               if (!client_only) {
+                       debug(query);
+
+                       new Ajax.Request(query, {
+                               onComplete: function(transport) { 
+                                       all_counters_callback2(transport); 
+                               } });
 
-               if (vfeedu && crow.className.match("Unread")) {
-                       vfeedu.innerHTML = (+vfeedu.innerHTML) - 1;
                }
 
+       } catch (e) {
+               exception_error("toggleMark", e);
        }
+}
 
-       var vfeedctr = document.getElementById("FEEDCTR--1");
-       var vfeedr = document.getElementById("FEEDR--1");
+function togglePub(id, client_only, no_effects) {
 
-       if (vfeedu && vfeedctr) {
-               if ((+vfeedu.innerHTML) > 0) {
-                       if (crow.className.match("Unread") && !vfeedr.className.match("Unread")) {
-                               vfeedr.className = vfeedr.className + "Unread";
-                               vfeedctr.className = "odd";
-                       }
+       try {
+
+               var query = "backend.php?op=rpc&id=" + id + "&subop=publ";
+       
+               query = query + "&afid=" + getActiveFeedId();
+       
+               if (tagsAreDisplayed()) {
+                       query = query + "&omode=tl";
+               } else {
+                       query = query + "&omode=flc";
+               }
+       
+               var mark_img = document.getElementById("FPPIC-" + id);
+               var vfeedu = document.getElementById("FEEDU--2");
+               var crow = document.getElementById("RROW-" + id);
+       
+               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 {
-                       vfeedctr.className = "invisible";
-                       vfeedr.className = vfeedr.className.replace("Unread", "");
+                       //mark_img.src = "images/pub_unset.png";
+                       mark_img.alt = __("Please wait...");
+                       query = query + "&pub=0";
+       
+/*                     if (vfeedu && crow.className.match("Unread")) {
+                               vfeedu.innerHTML = (+vfeedu.innerHTML) - 1;
+                       } */
+
+                       if (document.getElementById("headlinesList") && !no_effects) {
+                               Effect.Puff(mark_img, {duration : 0.25, afterFinish: tPub_afh_off});
+                       } else { 
+                               mark_img.src = mark_img.src.replace("pub_set", "pub_unset");
+                               mark_img.alt = __("Publish article");
+                       }
+               }
+       
+/*             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", "");
+                       }
+               }
+       
+               debug("toggle published for aid " + id);
+       
+               new Ajax.Request(query); */
+
+               if (!client_only) {
+                       new Ajax.Request(query, {
+                               onComplete: function(transport) { 
+                                       all_counters_callback2(transport); 
+                               } });
                }
+
+       } catch (e) {
+
+               exception_error("togglePub", e);
        }
+}
 
-       debug("toggle starred for aid " + id);
+function correctHeadlinesOffset(id) {
+       
+       try {
+
+               var hlist = document.getElementById("headlinesList");
+               var container = document.getElementById("headlinesInnerContainer");
+               var row = document.getElementById("RROW-" + id);
+       
+               var viewport = container.offsetHeight;
+       
+               var rel_offset_top = row.offsetTop - container.scrollTop;
+               var rel_offset_bottom = row.offsetTop + row.offsetHeight - container.scrollTop;
+       
+               debug("Rtop: " + rel_offset_top + " Rbtm: " + rel_offset_bottom);
+               debug("Vport: " + viewport);
+
+               if (rel_offset_top <= 0 || rel_offset_top > viewport) {
+                       container.scrollTop = row.offsetTop;
+               } else if (rel_offset_bottom > viewport) {
+
+                       /* doesn't properly work with Opera in some cases because
+                               Opera fucks up element scrolling */
 
-       new Ajax.Request(query);
+                       container.scrollTop = row.offsetTop + row.offsetHeight - viewport;              
+               } 
+
+       } catch (e) {
+               exception_error("correctHeadlinesOffset", e);
+       }
 
 }
 
@@ -208,8 +661,8 @@ function moveToPost(mode) {
 
        var rows = getVisibleHeadlineIds();
 
-       var prev_id;
-       var next_id;
+       var prev_id = false;
+       var next_id = false;
 
        if (!document.getElementById('RROW-' + active_post_id)) {
                active_post_id = false;
@@ -228,13 +681,15 @@ function moveToPost(mode) {
        }
 
        if (mode == "next") {
-               if (next_id != undefined) {
+               if (next_id) {
+                       correctHeadlinesOffset(next_id);
                        view(next_id, getActiveFeedId());
                }
        }
 
        if (mode == "prev") {
-               if ( prev_id != undefined) {
+               if (prev_id) {
+                       correctHeadlinesOffset(prev_id);
                        view(prev_id, getActiveFeedId());
                }
        } 
@@ -242,10 +697,6 @@ function moveToPost(mode) {
 
 function toggleUnread(id, cmode) {
        try {
-               if (!xmlhttp_ready(xmlhttp_rpc)) {
-                       printLockingError();
-                       return;
-               }
        
                var row = document.getElementById("RROW-" + id);
                if (row) {
@@ -253,20 +704,29 @@ function toggleUnread(id, cmode) {
                        nc = nc.replace("Unread", "");
                        nc = nc.replace("Selected", "");
 
-                       if (row.className.match("Unread")) {
+                       if (cmode == undefined || cmode == 2) {
+                               if (row.className.match("Unread")) {
+                                       row.className = nc;
+                               } else {
+                                       row.className = nc + "Unread";
+                               }
+                       } else if (cmode == 0) {
                                row.className = nc;
-                       } else {
+                       } else if (cmode == 1) {
                                row.className = nc + "Unread";
                        }
 
-                       if (!cmode) cmode = 2;
+                       if (cmode == undefined) cmode = 2;
 
                        var query = "backend.php?op=rpc&subop=catchupSelected&ids=" +
                                param_escape(id) + "&cmode=" + param_escape(cmode);
 
-                       xmlhttp_rpc.open("GET", query, true);
-                       xmlhttp_rpc.onreadystatechange=all_counters_callback;
-                       xmlhttp_rpc.send(null);
+//                     notify_progress("Loading, please wait...");
+
+                       new Ajax.Request(query, {
+                               onComplete: function(transport) { 
+                                       all_counters_callback2(transport); 
+                               } });
 
                }
 
@@ -276,13 +736,8 @@ function toggleUnread(id, cmode) {
        }
 }
 
-function selectionToggleUnread(cdm_mode, set_state, callback_func) {
+function selectionToggleUnread(cdm_mode, set_state, callback_func, no_error) {
        try {
-               if (!xmlhttp_ready(xmlhttp_rpc)) {
-                       printLockingError();
-                       return;
-               }
-       
                var rows;
 
                if (cdm_mode) {
@@ -291,6 +746,11 @@ function selectionToggleUnread(cdm_mode, set_state, callback_func) {
                        rows = getSelectedTableRowIds("headlinesList", "RROW", "RCHK");
                }
 
+               if (rows.length == 0 && !no_error) {
+                       alert(__("No articles are selected."));
+                       return;
+               }
+
                for (i = 0; i < rows.length; i++) {
                        var row = document.getElementById("RROW-" + rows[i]);
                        if (row) {
@@ -298,9 +758,19 @@ function selectionToggleUnread(cdm_mode, set_state, callback_func) {
                                nc = nc.replace("Unread", "");
                                nc = nc.replace("Selected", "");
 
-                               if (row.className.match("Unread")) {
+                               if (set_state == undefined) {
+                                       if (row.className.match("Unread")) {
+                                               row.className = nc + "Selected";
+                                       } else {
+                                               row.className = nc + "UnreadSelected";
+                                       }
+                               }
+
+                               if (set_state == false) {
                                        row.className = nc + "Selected";
-                               } else {
+                               }
+
+                               if (set_state == true) {
                                        row.className = nc + "UnreadSelected";
                                }
                        }
@@ -321,11 +791,12 @@ function selectionToggleUnread(cdm_mode, set_state, callback_func) {
                        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); 
+                               } });
 
                }
 
@@ -336,10 +807,6 @@ function selectionToggleUnread(cdm_mode, set_state, callback_func) {
 
 function selectionToggleMarked(cdm_mode) {
        try {
-               if (!xmlhttp_ready(xmlhttp_rpc)) {
-                       printLockingError();
-                       return;
-               }
        
                var rows;
                
@@ -349,35 +816,81 @@ function selectionToggleMarked(cdm_mode) {
                        rows = getSelectedTableRowIds("headlinesList", "RROW", "RCHK");
                }       
 
+               if (rows.length == 0) {
+                       alert(__("No articles are selected."));
+                       return;
+               }
+
                for (i = 0; i < rows.length; i++) {
-                       var row = document.getElementById("RROW-" + rows[i]);
-                       var mark_img = document.getElementById("FMARKPIC-" + rows[i]);
+                       toggleMark(rows[i], true, true);
+               }
 
-                       if (row && mark_img) {
+               if (rows.length > 0) {
 
-                               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)');
+                       var query = "backend.php?op=rpc&subop=markSelected&ids=" +
+                               param_escape(rows.toString()) + "&cmode=2";
 
-                               } else {
-                                       mark_img.src = "images/mark_unset.png";
-                                       mark_img.alt = "Set mark";
-                                       mark_img.setAttribute('onclick', 
-                                               'javascript:toggleMark('+rows[i]+', true)');
-                               }
-                       }
+                       query = query + "&afid=" + getActiveFeedId();
+
+/*                     if (tagsAreDisplayed()) {
+                               query = query + "&omode=tl";
+                       } else {
+                               query = query + "&omode=flc";
+                       } */
+
+                       query = query + "&omode=lc";
+
+                       new Ajax.Request(query, {
+                               onComplete: function(transport) { 
+                                       all_counters_callback2(transport); 
+                               } });
+
+               }
+
+       } catch (e) {
+               exception_error("selectionToggleMarked", e);
+       }
+}
+
+function selectionTogglePublished(cdm_mode) {
+       try {
+       
+               var rows;
+               
+               if (cdm_mode) {
+                       rows = cdmGetSelectedArticles();
+               } else {        
+                       rows = getSelectedTableRowIds("headlinesList", "RROW", "RCHK");
+               }       
+
+               if (rows.length == 0) {
+                       alert(__("No articles are selected."));
+                       return;
+               }
+
+               for (i = 0; i < rows.length; i++) {
+                       togglePub(rows[i], true, true);
                }
 
                if (rows.length > 0) {
 
-                       var query = "backend.php?op=rpc&subop=markSelected&ids=" +
+                       var query = "backend.php?op=rpc&subop=publishSelected&ids=" +
                                param_escape(rows.toString()) + "&cmode=2";
 
-                       xmlhttp_rpc.open("GET", query, true);
-                       xmlhttp_rpc.onreadystatechange=all_counters_callback;
-                       xmlhttp_rpc.send(null);
+                       query = query + "&afid=" + getActiveFeedId();
+
+/*                     if (tagsAreDisplayed()) {
+                               query = query + "&omode=tl";
+                       } else {
+                               query = query + "&omode=flc";
+                       } */
+
+                       query = query + "&omode=lc";
+
+                       new Ajax.Request(query, {
+                               onComplete: function(transport) { 
+                                       all_counters_callback2(transport); 
+                               } });
 
                }
 
@@ -402,6 +915,39 @@ function cdmGetSelectedArticles() {
        return sel_articles;
 }
 
+function cdmGetVisibleArticles() {
+       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.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.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");
@@ -434,24 +980,77 @@ function cdmSelectArticles(mode) {
 
 function catchupPage() {
 
+       var fn = getFeedName(getActiveFeedId(), active_feed_is_cat);
+       
+       var str = __("Mark all visible articles in %s as read?");
+
+       str = str.replace("%s", fn);
+
+       if (getInitParam("confirm_feed_catchup") == 1 && !confirm(str)) {
+               return;
+       }
+
        if (document.getElementById("headlinesList")) {
                selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', true, 'Unread', true);
-               selectionToggleUnread(false, false, 'viewCurrentFeed()');
+               selectionToggleUnread(false, false, 'viewCurrentFeed()', true);
                selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', false);
        } else {
                cdmSelectArticles('all');
-               selectionToggleUnread(true, false, 'viewCurrentFeed()')
+               selectionToggleUnread(true, false, 'viewCurrentFeed()', true)
                cdmSelectArticles('none');
        }
 }
 
+function catchupSelection() {
+
+       try {
+
+               var rows;
+       
+               if (document.getElementById("headlinesList")) {
+                       rows = getSelectedTableRowIds("headlinesList", "RROW", "RCHK");
+               } else {        
+                       rows = cdmGetSelectedArticles();
+               }
+       
+               if (rows.length == 0) {
+                       alert(__("No articles are selected."));
+                       return;
+               }
+       
+       
+               var fn = getFeedName(getActiveFeedId(), active_feed_is_cat);
+               
+               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)) {
+                       return;
+               }
+       
+               if (document.getElementById("headlinesList")) {
+                       selectionToggleUnread(false, false, 'viewCurrentFeed()', true);
+       //              selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', false);
+               } else {
+                       selectionToggleUnread(true, false, 'viewCurrentFeed()', true)
+       //              cdmSelectArticles('none');
+               }
+
+       } catch (e) {
+               exception_error("catchupSelection", e);
+       }
+}
+
+
 function labelFromSearch(search, search_mode, match_on, feed_id, is_cat) {
 
        if (!xmlhttp_ready(xmlhttp_rpc)) {
                printLockingError();
        }
 
-       var title = prompt("Please enter label title:", "");
+       var title = prompt(__("Please enter label title:"), "");
 
        if (title) {
 
@@ -461,18 +1060,21 @@ function labelFromSearch(search, search_mode, match_on, feed_id, 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);
-       }
 
+               new Ajax.Request(query, {
+                       onComplete: function(transport) {
+                                       dlg_frefresh_callback(transport);
+                               } });
+       }
 }
 
 function editArticleTags(id, feed_id, cdm_enabled) {
        _tag_active_post_id = id;
        _tag_active_feed_id = feed_id;
        _tag_active_cdm = cdm_enabled;
+
+       cache_invalidate(id);
+
        try {
                _tag_cdm_scroll = document.getElementById("headlinesInnerContainer").scrollTop;
        } catch (e) { }
@@ -480,49 +1082,48 @@ function editArticleTags(id, feed_id, cdm_enabled) {
 }
 
 
-function tag_saved_callback() {
-       if (xmlhttp_rpc.readyState == 4) {
-               try {
-                       debug("in tag_saved_callback");
+function tag_saved_callback(transport) {
+       try {
+               debug("in tag_saved_callback");
 
-                       closeInfoBox();
-                       notify("");
+               closeInfoBox();
+               notify("");
 
-                       if (tagsAreDisplayed()) {
-                               _reload_feedlist_after_view = true;
-                       }
+               if (tagsAreDisplayed()) {
+                       _reload_feedlist_after_view = true;
+               }
 
-                       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);                 
-                               }
-                       } else {
-                               debug("reloading current feed");
-                               viewCurrentFeed();
+               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);                 
                        }
-
-               } catch (e) {
-                       exception_error("catchup_callback", e);
+               } else {
+                       debug("reloading current feed");
+                       viewCurrentFeed();
                }
+
+       } catch (e) {
+               exception_error("catchup_callback", e);
        }
 }
 
 function editTagsSave() {
 
-       if (!xmlhttp_ready(xmlhttp_rpc)) {
-               printLockingError();
-       }
-
        notify_progress("Saving article tags...");
 
        var form = document.forms["tag_edit_form"];
 
        var query = Form.serialize("tag_edit_form");
 
-       xmlhttp_rpc.open("GET", "backend.php?op=rpc&subop=setArticleTags&" + query, true);                      
-       xmlhttp_rpc.onreadystatechange=tag_saved_callback;
-       xmlhttp_rpc.send(null);
+       query = "backend.php?op=rpc&subop=setArticleTags&" + query;
+
+       debug(query);
+
+       new Ajax.Request(query, {
+               onComplete: function(transport) {
+                               tag_saved_callback(transport);
+                       } });
 
 }
 
@@ -603,7 +1204,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]);
@@ -615,9 +1216,10 @@ 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); 
+                               } });
 
                }
 
@@ -628,3 +1230,230 @@ function cdmWatchdog() {
        }
 
 }
+
+
+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 + " [p=" + param + "]");
+       }
+}
+
+function cache_find(id) {
+       for (var i = 0; i < article_cache.length; i++) {
+               if (article_cache[i]["id"] == id) {
+                       return article_cache[i]["data"];
+               }
+       }
+       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) {
+                       return true;
+               }
+       }
+       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) {
+               article_cache.shift();
+       }
+}
+
+function cache_invalidate(id) {
+       var i = 0
+
+       try {   
+
+               while (i < article_cache.length) {
+                       if (article_cache[i]["id"] == id) {
+                               debug("cache_invalidate: removed id " + id);
+                               article_cache.splice(i, 1);
+                               return true;
+                       }
+                       i++;
+               }
+               debug("cache_invalidate: id not found: " + id);
+               return false;
+       } catch (e) {
+               exception_error("cache_invalidate", e);
+       }
+}
+
+function getActiveArticleId() {
+       return active_post_id;
+}
+
+function cdmMouseIn(elem) {
+       try {
+               if (elem.id && elem.id.match("RROW-")) {
+                       var id = elem.id.replace("RROW-", "");
+                       active_post_id = id;
+               }
+       } catch (e) {
+               exception_error("cdmMouseIn", e);
+       }
+
+}
+
+function cdmMouseOut(elem) {
+       active_post_id = false;
+}
+
+function headlines_scroll_handler() {
+       try {
+
+               var e = document.getElementById("headlinesInnerContainer");
+
+               // don't do infinite scrolling when Limit == All
+
+               var toolbar_form = document.forms["main_toolbar_form"];
+
+               var limit = toolbar_form.limit[toolbar_form.limit.selectedIndex];
+               if (limit.value != 0) {
+                       if (e.scrollTop + e.offsetHeight > e.scrollHeight - 50) {
+                               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;
+
+               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);
+       }
+
+}
+
+