]> git.wh0rd.org - tt-rss.git/blobdiff - viewfeed.js
use multiple classes to mark statuses, JS code cleanup
[tt-rss.git] / viewfeed.js
index f9fb8b607163f9cd5c6ee5a255c922525d5a2371..597ae53021bc6fa863b5df794827202d58e6420d 100644 (file)
@@ -15,11 +15,16 @@ var post_under_pointer = false;
 
 var last_requested_article = false;
 
+var preload_id_batch = [];
+var preload_timeout_id = false;
+
+var cache_added = [];
+
 function catchup_callback2(transport, callback) {
        try {
-               debug("catchup_callback2 " + transport + ", " + callback);
+               console.log("catchup_callback2 " + transport + ", " + callback);
                notify("");                     
-               all_counters_callback2(transport);
+               handle_rpc_reply(transport);
                if (callback) {
                        setTimeout(callback, 10);       
                }
@@ -28,34 +33,14 @@ function catchup_callback2(transport, callback) {
        }
 }
 
-function clean_feed_selections() {
-       try {
-               var feeds = $("feedList").getElementsByTagName("LI");
-
-               for (var i = 0; i < feeds.length; i++) {
-                       if (feeds[i].id && feeds[i].id.match("FEEDR-")) {
-                               feeds[i].className = feeds[i].className.replace("Selected", "");
-                       }                       
-                       if (feeds[i].id && feeds[i].id.match("FCAT-")) {
-                               feeds[i].className = feeds[i].className.replace("Selected", "");
-                       }
-               }
-       } catch (e) {
-               exception_error("clean_feed_selections", e);
-       }
-}
-
 function headlines_callback2(transport, feed_cur_page) {
        try {
 
-               if (!transport.responseText && db) {
-                       offlineConfirmModeChange();
-                       return;
-               }
+               if (!handle_rpc_reply(transport)) return;
 
                loading_set_progress(100);
 
-               debug("headlines_callback2 [page=" + feed_cur_page + "]");
+               console.log("headlines_callback2 [page=" + feed_cur_page + "]");
 
                if (!transport_error_check(transport)) return;
 
@@ -73,23 +58,25 @@ function headlines_callback2(transport, feed_cur_page) {
                        }
                }
 
+               var update_btn = document.forms["main_toolbar_form"].update;
+
+               update_btn.disabled = !(feed_id >= 0 && !is_cat);
+
                var ll = $('FLL-' + feed_id);
 
+               if (ll && ll.parentNode) 
+                       ll.parentNode.removeChild(ll);
+
                if (!is_cat) {
                        var feedr = $("FEEDR-" + feed_id);
-                       if (feedr && !feedr.className.match("Selected")) {      
-                               feedr.className = feedr.className + "Selected";
+                       if (feedr) {    
+                               feedr.addClassName("Selected");
                        } 
-                       if (feedr && ll) feedr.removeChild(ll);
                } else {
                        var feedr = $("FCAT-" + feed_id);
-                       if (feedr && !feedr.className.match("Selected")) {      
-                               feedr.className = feedr.className + "Selected";
+                       if (feedr) {    
+                               feedr.addClassName("Selected");
                        } 
-
-                       var fcap = $("FCAP-" + feed_id);
-                       if (fcap && ll) fcap.removeChild(ll);
-
                }
 
                var img = $('FIMG-' + feed_id);
@@ -101,34 +88,39 @@ function headlines_callback2(transport, feed_cur_page) {
                var f = $("headlines-frame");
                try {
                        if (feed_cur_page == 0) { 
-                               debug("resetting headlines scrollTop");
+                               //console.log("resetting headlines scrollTop");
                                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 response = transport.responseXML;
 
-                       var vgroup_last_feed_obj =  transport.responseXML.getElementsByTagName("vgroup-last-feed")[0];
+                       var headlines = response.getElementsByTagName("headlines")[0];
+                       var headlines_info = response.getElementsByTagName("headlines-info")[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_info)
+                               headlines_info = JSON.parse(headlines_info.firstChild.nodeValue);
+                       else {
+                               console.error("didn't find headlines-info object in response");
+                               return;
+                       }
 
-                       vgroup_last_feed = vgroup_last_feed_obj.getAttribute("value");
+                       var headlines_count = headlines_info.count;
+                       var headlines_unread = headlines_info.unread;
+                       var disable_cache = headlines_info.disable_cache;
+                       
+                       vgroup_last_feed = headlines_info.vgroup_last_feed;
 
-                       if (headlines_count == 0) {
+                       if (parseInt(headlines_count) < getInitParam("default_article_limit")) {
                                _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");
+                       var counters = response.getElementsByTagName("counters")[0];
+                       var articles = response.getElementsByTagName("article");
+                       var runtime_info = response.getElementsByTagName("runtime-info");
        
                        if (feed_cur_page == 0) {
                                if (headlines) {
@@ -150,36 +142,32 @@ function headlines_callback2(transport, feed_cur_page) {
                                        }
 
                                } else {
-                                       debug("headlines_callback: returned no data");
+                                       console.warn("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...");
+                                               console.log("adding some more headlines...");
        
-                                               var c = $("headlinesList");
-               
-                                               if (!c) {
-                                                       c = $("headlinesInnerContainer");
-                                               }
+                                               c = $("headlinesInnerContainer");
 
                                                var ids = getSelectedArticleIds2();
        
                                                c.innerHTML = c.innerHTML + headlines.firstChild.nodeValue;
 
-                                               debug("restore selected ids: " + ids);
+                                               console.log("restore selected ids: " + ids);
 
                                                for (var i = 0; i < ids.length; i++) {
                                                        markHeadline(ids[i]);
                                                }
 
                                        } else {
-                                               debug("no new headlines received");
+                                               console.log("no new headlines received");
                                        }
                                } else {
-                                       debug("headlines_callback: returned no data");
+                                       console.warn("headlines_callback: returned no data");
                                        notify_error("Error while trying to load more headlines");      
                                }
 
@@ -188,47 +176,38 @@ function headlines_callback2(transport, feed_cur_page) {
                        if (articles) {
                                for (var i = 0; i < articles.length; i++) {
                                        var a_id = articles[i].getAttribute("id");
-                                       debug("found id: " + a_id);
+                                       //console.log("found id: " + a_id);
                                        cache_inject(a_id, articles[i].firstChild.nodeValue);
                                }
                        } else {
-                               debug("no cached articles received");
+                               console.log("no cached articles received");
                        }
-       
-                       if (counters) {
-                               debug("parsing piggybacked counters: " + counters);
-                               parse_counters(counters, false);
-                       } else {
-                               debug("counters container not found in reply, requesting...");
+
+                       if (counters)
+                               parse_counters(counters);
+                       else
                                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");
+                       console.warn("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 (!$("headlinesList") && 
+
+               if (isCdmMode() && 
                                getActiveFeedId() != -3 &&
                                getInitParam("cdm_auto_catchup") == 1) {
-                       debug("starting CDM watchdog");
+                       console.log("starting CDM watchdog");
                        _cdm_wd_timeout = window.setTimeout("cdmWatchdog()", 5000);
                        _cdm_wd_vishist = new Array();
                } else {
-                       debug("not in CDM mode or watchdog disabled");
+                       console.log("not in CDM mode or watchdog disabled");
                }
        
                _feed_cur_page = feed_cur_page;
@@ -269,18 +248,18 @@ function showArticleInHeadlines(id) {
 
        try {
 
-               cleanSelected("headlinesList");
-       
+               selectArticles("none");
+
                var crow = $("RROW-" + id);
 
                if (!crow) return;
 
-               var article_is_unread = crow.className.match("Unread");
+               var article_is_unread = crow.hasClassName("Unread");
                        
-               crow.className = crow.className.replace("Unread", "");
+               crow.removeClassName("Unread");
+
+               selectArticles('none');
 
-               selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', false);
-       
                var upd_img_pic = $("FUPDPIC-" + id);
 
                var cache_prefix = "";
@@ -325,6 +304,9 @@ function showArticleInHeadlines(id) {
 
                markHeadline(id);
 
+               if (article_is_unread)
+                       _force_scheduled_update = true;
+
        } catch (e) {
                exception_error("showArticleInHeadlines", e);
        }
@@ -332,12 +314,9 @@ function showArticleInHeadlines(id) {
 
 function article_callback2(transport, id) {
        try {
-               debug("article_callback2 " + id);
+               console.log("article_callback2 " + id);
 
-               if (!transport.responseText && db) {
-                       offlineConfirmModeChange();
-                       return;
-               }
+               if (!handle_rpc_reply(transport)) return;
 
                if (transport.responseXML) {
 
@@ -355,23 +334,23 @@ function article_callback2(transport, id) {
                        }
 
                        if (id != last_requested_article) {
-                               debug("requested article id is out of sequence, aborting");
+                               console.log("requested article id is out of sequence, aborting");
                                return;
                        }
 
-                       active_post_id = id; 
+//                     active_post_id = id; 
 
-                       debug("looking for articles to cache...");
+                       //console.log("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);
+                               //console.log("found id: " + a_id);
 
                                if (a_id == active_post_id) {
-                                       debug("active article, rendering...");                                  
+                                       //console.log("active article, rendering...");                                  
                                        render_article(articles[i].firstChild.nodeValue);
                                }
 
@@ -379,7 +358,7 @@ function article_callback2(transport, id) {
                        }
 
 
-                       showArticleInHeadlines(id);     
+//                     showArticleInHeadlines(id);     
 
                        if (db) {
                                db.execute("UPDATE articles SET unread = 0 WHERE id = ?", [id]);
@@ -388,7 +367,7 @@ function article_callback2(transport, id) {
                        var reply = transport.responseXML.firstChild.firstChild;
                
                } else {
-                       debug("article_callback: returned no XML object");
+                       console.warn("article_callback: returned no XML object");
                        //var f = $("content-frame");
                        //f.innerHTML = "<div class='whiteBox'>" + __('Could not display article (missing XML object)') + "</div>";
                }
@@ -396,25 +375,11 @@ function article_callback2(transport, id) {
                var date = new Date();
                last_article_view = date.getTime() / 1000;
 
-               if (typeof correctPNG != 'undefined') {
-                       correctPNG();
-               }
-
                if (_reload_feedlist_after_view) {
                        setTimeout('updateFeedList(false, false)', 50);                 
                        _reload_feedlist_after_view = false;
                } else {
-                       if (transport.responseXML) {
-                               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, requesting...");
-                                       request_counters();
-                               }
-                       }
+                       request_counters();
                }
 
                notify("");
@@ -425,13 +390,13 @@ function article_callback2(transport, id) {
 
 function view(id) {
        try {
-               debug("loading article: " + id);
+               console.log("loading article: " + id);
 
                if (offline_mode) return view_offline(id);
 
                var cached_article = cache_find(id);
 
-               debug("cache check result: " + (cached_article != false));
+               console.log("cache check result: " + (cached_article != false));
        
                enableHotkeys();
                hideAuxDlg();
@@ -450,44 +415,18 @@ function view(id) {
                        }
                }
 
-               debug("additional ids: " + cids_to_request.toString());                 
-
-               /* additional info for piggyback counters */
-
-               if (tagsAreDisplayed()) {
-                       query = query + "&omode=lt";
-               } else {
-                       query = query + "&omode=flc";
-               }
-
+               console.log("additional ids: " + cids_to_request.toString());                   
+       
                query = query + "&cids=" + cids_to_request.toString();
 
                var crow = $("RROW-" + id);
-               var article_is_unread = crow.className.match("Unread");
-
-               if (!async_counters_work) {
-                       query = query + "&csync=true";
-               }
+               var article_is_unread = crow.hasClassName("Unread");
 
+               active_post_id = id;
                showArticleInHeadlines(id);
 
                if (!cached_article) {
 
-//                     notify_progress("Loading, please wait...", true);
-
-/*                     var content = $('HLC-' + id);
-
-                       if (content && !$('LL-' + id)) {
-                               var ll = document.createElement('img');
-               
-                               ll.src = 'images/indicator_tiny.gif';
-                               ll.className = 'hlLoading';
-                               ll.id = 'LL-' + id;
-
-                               content.appendChild(ll);
-
-                       } */
-
                        var upic = $('FUPDPIC-' + id);
 
                        if (upic) {     
@@ -536,7 +475,7 @@ function tMark_afh_off(effect) {
        try {
                var elem = effect.effects[0].element;
 
-               debug("tMark_afh_off : " + elem.id);
+               //console.log("tMark_afh_off : " + elem.id);
 
                if (elem) {
                        elem.src = elem.src.replace("mark_set", "mark_unset");
@@ -553,7 +492,7 @@ function tPub_afh_off(effect) {
        try {
                var elem = effect.effects[0].element;
 
-               debug("tPub_afh_off : " + elem.id);
+               //console.log("tPub_afh_off : " + elem.id);
 
                if (elem) {
                        elem.src = elem.src.replace("pub_set", "pub_unset");
@@ -566,30 +505,17 @@ function tPub_afh_off(effect) {
        }
 }
 
-function toggleMark(id, client_only, no_effects) {
-
+function toggleMark(id, client_only) {
        try {
-
                var query = "?op=rpc&id=" + id + "&subop=mark";
        
-               query = query + "&afid=" + getActiveFeedId();
-       
-               if (tagsAreDisplayed()) {
-                       query = query + "&omode=tl";
-               } else {
-                       query = query + "&omode=flc";
-               }
-       
-               var mark_img = $("FMPIC-" + id);
+               var img = $("FMPIC-" + id);
 
-               if (!mark_img) return;
-
-               var vfeedu = $("FEEDU--1");
-               var crow = $("RROW-" + id);
+               if (!img) return;
        
-               if (mark_img.src.match("mark_unset")) {
-                       mark_img.src = mark_img.src.replace("mark_unset", "mark_set");
-                       mark_img.alt = __("Unstar article");
+               if (img.src.match("mark_unset")) {
+                       img.src = img.src.replace("mark_unset", "mark_set");
+                       img.alt = __("Unstar article");
                        query = query + "&mark=1";
 
                        if (db) {
@@ -597,34 +523,23 @@ function toggleMark(id, client_only, no_effects) {
                        }
 
                } else {
-                       //mark_img.src = "images/mark_unset.png";
-                       mark_img.alt = __("Please wait...");
+                       img.src = img.src.replace("mark_set", "mark_unset");
+                       img.alt = __("Star article");
                        query = query + "&mark=0";
-       
-                       if ($("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");
-                       }
 
                        if (db) {
                                db.execute("UPDATE articles SET marked = 0 WHERE id = ?", [id]);
                        }
-
                }
 
-               if (!no_effects) update_local_feedlist_counters();
+               update_local_feedlist_counters();
 
                if (!client_only) {
-                       debug(query);
-
                        new Ajax.Request("backend.php", {
                                parameters: query,
                                onComplete: function(transport) { 
-                                       all_counters_callback2(transport); 
+                                       handle_rpc_reply(transport); 
                                } });
-
                }
 
        } catch (e) {
@@ -633,55 +548,36 @@ function toggleMark(id, client_only, no_effects) {
 }
 
 function togglePub(id, client_only, no_effects, note) {
-
        try {
-
                var query = "?op=rpc&id=" + id + "&subop=publ";
        
-               query = query + "&afid=" + getActiveFeedId();
-
                if (note != undefined) {
                        query = query + "&note=" + param_escape(note);
                } else {
                        query = query + "&note=undefined";
                }
-       
-               if (tagsAreDisplayed()) {
-                       query = query + "&omode=tl";
-               } else {
-                       query = query + "&omode=flc";
-               }
-       
-               var mark_img = $("FPPIC-" + id);
 
-               if (!mark_img) return;
+               var img = $("FPPIC-" + id);
 
-               var vfeedu = $("FEEDU--2");
-               var crow = $("RROW-" + id);
+               if (!img) return;
        
-               if (mark_img.src.match("pub_unset") || note != undefined) {
-                       mark_img.src = mark_img.src.replace("pub_unset", "pub_set");
-                       mark_img.alt = __("Unpublish article");
+               if (img.src.match("pub_unset") || note != undefined) {
+                       img.src = img.src.replace("pub_unset", "pub_set");
+                       img.alt = __("Unpublish article");
                        query = query + "&pub=1";
 
                } else {
-                       //mark_img.src = "images/pub_unset.png";
-                       mark_img.alt = __("Please wait...");
+                       img.src = img.src.replace("pub_set", "pub_unset");
+                       img.alt = __("Publish article");
+
                        query = query + "&pub=0";
-       
-                       if ($("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");
-                       }
                }
 
                if (!client_only) {
                        new Ajax.Request("backend.php", {
                                parameters: query,
                                onComplete: function(transport) { 
-                                       all_counters_callback2(transport);
+                                       handle_rpc_reply(transport);
                
                                        var note = transport.responseXML.getElementsByTagName("note")[0];
                
@@ -712,50 +608,12 @@ function togglePub(id, client_only, no_effects, note) {
        }
 }
 
-function correctHeadlinesOffset(id) {
-       
-       try {
-
-               var hlist = $("headlinesList");
-               var container = $("headlinesInnerContainer");
-               var row = $("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 */
-
-                       container.scrollTop = row.offsetTop + row.offsetHeight - viewport;              
-               } 
-
-       } catch (e) {
-               exception_error("correctHeadlinesOffset", e);
-       }
-
-}
-
 function moveToPost(mode) {
 
        try {
 
-               var rows;
+               var rows = getVisibleArticleIds();
 
-               if (isCdmMode()) {
-                       rows = cdmGetVisibleArticles();
-               } else {
-                       rows = getVisibleHeadlineIds();
-               }
-               
                var prev_id = false;
                var next_id = false;
                
@@ -779,12 +637,8 @@ function moveToPost(mode) {
                        if (next_id) {
                                if (isCdmMode()) {
        
-                                       if (!cdmArticleIsActuallyVisible(next_id)) {
-                                               cdmScrollToArticleId(next_id);
-                                       }
-                                       cdmSelectArticles("none");
-                                       toggleUnread(next_id, 0, true);
-                                       toggleSelected(next_id);
+                                       cdmExpandArticle(next_id);
+                                       cdmScrollToArticleId(next_id);
 
                                } else {
                                        correctHeadlinesOffset(next_id);
@@ -796,10 +650,8 @@ function moveToPost(mode) {
                if (mode == "prev") {
                        if (prev_id) {
                                if (isCdmMode()) {
+                                       cdmExpandArticle(prev_id);
                                        cdmScrollToArticleId(prev_id);
-                                       cdmSelectArticles("none");
-                                       toggleUnread(prev_id, 0, true);
-                                       toggleSelected(prev_id);
                                } else {
                                        correctHeadlinesOffset(prev_id);
                                        view(prev_id, getActiveFeedId());
@@ -816,28 +668,16 @@ function toggleSelected(id) {
        try {
        
                var cb = $("RCHK-" + id);
-
                var row = $("RROW-" + id);
-               if (row) {
-                       var nc = row.className;
-                       
-                       if (!nc.match("Selected")) {
-                               nc = nc + "Selected";
-                               if (cb) {
-                                       cb.checked = true;
-                               }
 
-                               // In CDM basically last selected article == active article
-                               if (isCdmMode()) active_post_id = id;
+               if (row) {
+                       if (row.hasClassName('Selected')) {
+                               row.removeClassName('Selected');
+                               if (cb) cb.checked = false;
                        } else {
-                               nc = nc.replace("Selected", "");
-                               if (cb) {
-                                       cb.checked = false;
-                               }
-
+                               row.addClassName('Selected');
+                               if (cb) cb.checked = true;
                        }
-
-                       row.className = nc;
                }
        } catch (e) {
                exception_error("toggleSelected", e);
@@ -860,24 +700,9 @@ function toggleUnread(id, cmode, effect) {
        
                var row = $("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 = $("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 (row.hasClassName("Unread")) {
+                                       row.removeClassName("Unread");
 
                                        if (effect) {
                                                new Effect.Highlight(row, {duration: 1, startcolor: "#fff7d5",
@@ -886,7 +711,7 @@ function toggleUnread(id, cmode, effect) {
                                        } 
 
                                } else {
-                                       row.className = nc + "Unread";
+                                       row.addClassName("Unread");
                                }
 
                                if (db) {
@@ -895,7 +720,8 @@ function toggleUnread(id, cmode, effect) {
                                }
 
                        } else if (cmode == 0) {
-                               row.className = nc;
+
+                               row.removeClassName("Unread");
 
                                if (effect) {
                                        new Effect.Highlight(row, {duration: 1, startcolor: "#fff7d5",
@@ -909,7 +735,7 @@ function toggleUnread(id, cmode, effect) {
                                }
 
                        } else if (cmode == 1) {
-                               row.className = nc + "Unread";
+                               row.addClassName("Unread");
 
                                if (db) {
                                        db.execute("UPDATE articles SET unread = 1 "+
@@ -920,9 +746,6 @@ function toggleUnread(id, cmode, effect) {
 
                        update_local_feedlist_counters();
 
-                       // 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 = "?op=rpc&subop=catchupSelected" +
@@ -933,7 +756,7 @@ function toggleUnread(id, cmode, effect) {
                        new Ajax.Request("backend.php", {
                                parameters: query,
                                onComplete: function(transport) { 
-                                       all_counters_callback2(transport); 
+                                       handle_rpc_reply(transport); 
                                } });
 
                }
@@ -960,6 +783,8 @@ function selectionRemoveLabel(id) {
                        var query = "?op=rpc&subop=removeFromLabel&ids=" +
                                param_escape(ids.toString()) + "&lid=" + param_escape(id);
 
+                       console.log(query);
+
 //                     notify_progress("Loading, please wait...");
 
                        cache_invalidate("F:" + (-11 - id));
@@ -968,7 +793,7 @@ function selectionRemoveLabel(id) {
                                parameters: query,
                                onComplete: function(transport) { 
                                        show_labels_in_headlines(transport);
-                                       all_counters_callback2(transport);
+                                       handle_rpc_reply(transport);
                                } });
 
 //             }
@@ -998,13 +823,15 @@ function selectionAssignLabel(id) {
                        var query = "?op=rpc&subop=assignToLabel&ids=" +
                                param_escape(ids.toString()) + "&lid=" + param_escape(id);
 
+                       console.log(query);
+
 //                     notify_progress("Loading, please wait...");
 
                        new Ajax.Request("backend.php", {
                                parameters: query,
                                onComplete: function(transport) { 
                                        show_labels_in_headlines(transport);
-                                       all_counters_callback2(transport);
+                                       handle_rpc_reply(transport);
                                } });
 
 //             }
@@ -1015,15 +842,9 @@ function selectionAssignLabel(id) {
        }
 }
 
-function selectionToggleUnread(cdm_mode, set_state, callback_func, no_error) {
+function selectionToggleUnread(set_state, callback_func, no_error) {
        try {
-               var rows;
-
-               if (cdm_mode) {
-                       rows = cdmGetSelectedArticles();
-               } else {        
-                       rows = getSelectedTableRowIds("headlinesList", "RROW", "RCHK");
-               }
+               var rows = getSelectedArticleIds2();
 
                if (rows.length == 0 && !no_error) {
                        alert(__("No articles are selected."));
@@ -1033,15 +854,11 @@ function selectionToggleUnread(cdm_mode, set_state, callback_func, no_error) {
                for (i = 0; i < rows.length; i++) {
                        var row = $("RROW-" + rows[i]);
                        if (row) {
-                               var nc = row.className;
-                               nc = nc.replace("Unread", "");
-                               nc = nc.replace("Selected", "");
-
                                if (set_state == undefined) {
-                                       if (row.className.match("Unread")) {
-                                               row.className = nc + "Selected";
+                                       if (row.hasClassName("Unread")) {
+                                               row.removeClassName("Unread");
                                        } else {
-                                               row.className = nc + "UnreadSelected";
+                                               row.addClassName("Unread");
                                        }
                                        if (db) {
                                                db.execute("UPDATE articles SET unread = NOT unread WHERE id = ?", 
@@ -1050,7 +867,8 @@ function selectionToggleUnread(cdm_mode, set_state, callback_func, no_error) {
                                }
 
                                if (set_state == false) {
-                                       row.className = nc + "Selected";
+                                       row.removeClassName("Unread");
+
                                        if (db) {
                                                db.execute("UPDATE articles SET unread = 0 WHERE id = ?", 
                                                        [rows[i]]);
@@ -1058,7 +876,8 @@ function selectionToggleUnread(cdm_mode, set_state, callback_func, no_error) {
                                }
 
                                if (set_state == true) {
-                                       row.className = nc + "UnreadSelected";
+                                       row.addClassName("Unread");
+
                                        if (db) {
                                                db.execute("UPDATE articles SET unread = 1 WHERE id = ?", 
                                                        [rows[i]]);
@@ -1099,17 +918,11 @@ function selectionToggleUnread(cdm_mode, set_state, callback_func, no_error) {
        }
 }
 
-function selectionToggleMarked(cdm_mode) {
+function selectionToggleMarked() {
        try {
        
-               var rows;
+               var rows = getSelectedArticleIds2();
                
-               if (cdm_mode) {
-                       rows = cdmGetSelectedArticles();
-               } else {        
-                       rows = getSelectedTableRowIds("headlinesList", "RROW", "RCHK");
-               }       
-
                if (rows.length == 0) {
                        alert(__("No articles are selected."));
                        return;
@@ -1126,20 +939,10 @@ function selectionToggleMarked(cdm_mode) {
                        var query = "?op=rpc&subop=markSelected&ids=" +
                                param_escape(rows.toString()) + "&cmode=2";
 
-                       query = query + "&afid=" + getActiveFeedId();
-
-/*                     if (tagsAreDisplayed()) {
-                               query = query + "&omode=tl";
-                       } else {
-                               query = query + "&omode=flc";
-                       } */
-
-                       query = query + "&omode=lc";
-
                        new Ajax.Request("backend.php", {
                                parameters: query,
                                onComplete: function(transport) { 
-                                       all_counters_callback2(transport); 
+                                       handle_rpc_reply(transport); 
                                } });
 
                }
@@ -1149,16 +952,10 @@ function selectionToggleMarked(cdm_mode) {
        }
 }
 
-function selectionTogglePublished(cdm_mode) {
+function selectionTogglePublished() {
        try {
        
-               var rows;
-               
-               if (cdm_mode) {
-                       rows = cdmGetSelectedArticles();
-               } else {        
-                       rows = getSelectedTableRowIds("headlinesList", "RROW", "RCHK");
-               }       
+               var rows = getSelectedArticleIds2();
 
                if (rows.length == 0) {
                        alert(__("No articles are selected."));
@@ -1174,20 +971,10 @@ function selectionTogglePublished(cdm_mode) {
                        var query = "?op=rpc&subop=publishSelected&ids=" +
                                param_escape(rows.toString()) + "&cmode=2";
 
-                       query = query + "&afid=" + getActiveFeedId();
-
-/*                     if (tagsAreDisplayed()) {
-                               query = query + "&omode=tl";
-                       } else {
-                               query = query + "&omode=flc";
-                       } */
-
-                       query = query + "&omode=lc";
-
                        new Ajax.Request("backend.php", {
                                parameters: query,
                                onComplete: function(transport) { 
-                                       all_counters_callback2(transport); 
+                                       handle_rpc_reply(transport); 
                                } });
 
                }
@@ -1197,84 +984,69 @@ function selectionTogglePublished(cdm_mode) {
        }
 }
 
-function cdmGetSelectedArticles() {
-       var sel_articles = new Array();
-       var container = $("headlinesInnerContainer");
+function getSelectedArticleIds2() {
 
-       for (i = 0; i < container.childNodes.length; i++) {
-               var child = container.childNodes[i];
+       var rv = [];
 
-               if (child.id && child.id.match("RROW-") && child.className.match("Selected")) {
-                       var c_id = child.id.replace("RROW-", "");
-                       sel_articles.push(c_id);
-               }
-       }
+       $$("#headlinesInnerContainer > div[id*=RROW][class*=Selected]").each(
+               function(child) {
+                       rv.push(child.id.replace("RROW-", ""));
+               });
 
-       return sel_articles;
+       return rv;
 }
 
-function cdmGetVisibleArticles() {
-       var sel_articles = new Array();
-       var container = $("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 getLoadedArticleIds() {
+       var rv = [];
 
-function cdmGetUnreadArticles() {
-       var sel_articles = new Array();
-       var container = $("headlinesInnerContainer");
+       var children = $$("#headlinesInnerContainer > div[id*=RROW-]");
 
-       for (i = 0; i < container.childNodes.length; i++) {
-               var child = container.childNodes[i];
+       children.each(function(child) {
+                       rv.push(child.id.replace("RROW-", ""));
+               });
 
-               if (child.id && child.id.match("RROW-") && child.className.match("Unread")) {
-                       var c_id = child.id.replace("RROW-", "");
-                       sel_articles.push(c_id);
-               }
-       }
+       return rv;
 
-       return sel_articles;
 }
 
+// mode = all,none,unread,invert
+function selectArticles(mode) {
+       try {
 
-// mode = all,none,unread
-function cdmSelectArticles(mode) {
-       var container = $("headlinesInnerContainer");
-
-       for (i = 0; i < container.childNodes.length; i++) {
-               var child = container.childNodes[i];
-
-               if (child.id && child.id.match("RROW-")) {
-                       var aid = child.id.replace("RROW-", "");
+               var children = $$("#headlinesInnerContainer > div[id*=RROW]");
 
-                       var cb = $("RCHK-" + aid);
+               children.each(function(child) {
+                       var id = child.id.replace("RROW-", "");
+                       var cb = $("RCHK-" + id);
 
                        if (mode == "all") {
-                               if (!child.className.match("Selected")) {
-                                       child.className = child.className + "Selected";
+                               child.addClassName("Selected");
+                               cb.checked = true;
+                       } else if (mode == "unread") {
+                               if (child.hasClassName("Unread")) {
+                                       child.addClassName("Selected");
                                        cb.checked = true;
+                               } else {
+                                       child.removeClassName("Selected");
+                                       cb.checked = false;
                                }
-                       } else if (mode == "unread") {
-                               if (child.className.match("Unread") && !child.className.match("Selected")) {
-                                       child.className = child.className + "Selected";
+                       } else if (mode == "invert") {
+                               if (child.hasClassName("Selected")) {
+                                       child.removeClassName("Selected");
+                                       cb.checked = false;
+                               } else {
+                                       child.addClassName("Selected");
                                        cb.checked = true;
                                }
+
                        } else {
-                               child.className = child.className.replace("Selected", "");
+                               child.removeClassName("Selected");
                                cb.checked = false;
                        }
-               }               
+               });
+
+       } catch (e) {
+               exception_error("selectArticles", e);
        }
 }
 
@@ -1290,35 +1062,22 @@ function catchupPage() {
                return;
        }
 
-       if ($("headlinesList")) {
-               selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', true, 'Unread', true);
-               selectionToggleUnread(false, false, 'viewCurrentFeed()', true);
-               selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', false);
-       } else {
-               cdmSelectArticles('all');
-               selectionToggleUnread(true, false, 'viewCurrentFeed()', true)
-               cdmSelectArticles('none');
-       }
+       selectArticles('all');
+       selectionToggleUnread(false, 'viewCurrentFeed()', true)
+       selectArticles('none');
 }
 
 function deleteSelection() {
 
        try {
-
-               var rows;
-       
-               if ($("headlinesList")) {
-                       rows = getSelectedTableRowIds("headlinesList", "RROW", "RCHK");
-               } else {        
-                       rows = cdmGetSelectedArticles();
-               }
        
+               var rows = getSelectedArticleIds2();
+
                if (rows.length == 0) {
                        alert(__("No articles are selected."));
                        return;
                }
        
-       
                var fn = getFeedName(getActiveFeedId(), activeFeedIsCat());
                var str;
                var op;
@@ -1338,7 +1097,7 @@ function deleteSelection() {
 
                query = "?op=rpc&subop=delete&ids=" + param_escape(rows);
 
-               debug(query);
+               console.log(query);
 
                new Ajax.Request("backend.php", {
                        parameters: query,
@@ -1355,20 +1114,13 @@ function archiveSelection() {
 
        try {
 
-               var rows;
-       
-               if ($("headlinesList")) {
-                       rows = getSelectedTableRowIds("headlinesList", "RROW", "RCHK");
-               } else {        
-                       rows = cdmGetSelectedArticles();
-               }
-       
+               var rows = getSelectedArticleIds2();
+
                if (rows.length == 0) {
                        alert(__("No articles are selected."));
                        return;
                }
        
-       
                var fn = getFeedName(getActiveFeedId(), activeFeedIsCat());
                var str;
                var op;
@@ -1390,7 +1142,7 @@ function archiveSelection() {
 
                query = "?op=rpc&subop="+op+"&ids=" + param_escape(rows);
 
-               debug(query);
+               console.log(query);
 
                for (var i = 0; i < rows.length; i++) {
                        cache_invalidate(rows[i]);
@@ -1411,20 +1163,13 @@ function catchupSelection() {
 
        try {
 
-               var rows;
-       
-               if ($("headlinesList")) {
-                       rows = getSelectedTableRowIds("headlinesList", "RROW", "RCHK");
-               } else {        
-                       rows = cdmGetSelectedArticles();
-               }
-       
+               var rows = getSelectedArticleIds2();
+
                if (rows.length == 0) {
                        alert(__("No articles are selected."));
                        return;
                }
        
-       
                var fn = getFeedName(getActiveFeedId(), activeFeedIsCat());
                
                var str = __("Mark %d selected articles in %s as read?");
@@ -1436,13 +1181,7 @@ function catchupSelection() {
                        return;
                }
        
-               if ($("headlinesList")) {
-                       selectionToggleUnread(false, false, 'viewCurrentFeed()', true);
-       //              selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', false);
-               } else {
-                       selectionToggleUnread(true, false, 'viewCurrentFeed()', true)
-       //              cdmSelectArticles('none');
-               }
+               selectionToggleUnread(false, 'viewCurrentFeed()', true)
 
        } catch (e) {
                exception_error("catchupSelection", e);
@@ -1452,7 +1191,9 @@ function catchupSelection() {
 function editArticleTags(id, feed_id, cdm_enabled) {
        displayDlg('editArticleTags', id,
                           function () {
-                                  new Ajax.Autocompleter('tags_str', 'tags_choices',
+                                       $("tags_str").focus();
+
+                                       new Ajax.Autocompleter('tags_str', 'tags_choices',
                                           "backend.php?op=rpc&subop=completeTags",
                                           { tokens: ',', paramName: "search" });
                           });
@@ -1468,13 +1209,13 @@ function editTagsSave() {
 
        query = "?op=rpc&subop=setArticleTags&" + query;
 
-       debug(query);
+       //console.log(query);
 
        new Ajax.Request("backend.php", {
                parameters: query,
                onComplete: function(transport) {
                                try {
-                                       debug("tags saved...");
+                                       //console.log("tags saved...");
                        
                                        closeInfoBox();
                                        notify("");
@@ -1531,129 +1272,45 @@ function editTagsInsert() {
        }
 }
 
-function cdmScrollViewport(where) {
-       debug("cdmScrollViewport: " + where);
-
-       var ctr = $("headlinesInnerContainer");
-
-       if (!ctr) return;
-
-       if (where == "bottom") {
-               ctr.scrollTop = ctr.scrollHeight;
-       } else {
-               ctr.scrollTop = where;
-       }
-}
-
-function cdmArticleIsBelowViewport(id) {
+function cdmScrollToArticleId(id) {
        try {
                var ctr = $("headlinesInnerContainer");
                var e = $("RROW-" + id);
 
                if (!e || !ctr) return;
 
-               // article starts below viewport
-
-               if (ctr.scrollTop < e.offsetTop) {
-                       return true;
-               } else {        
-                       return false;
-               }
+               ctr.scrollTop = e.offsetTop;
 
        } catch (e) {
-               exception_error("cdmArticleIsVisible", e);
+               exception_error("cdmScrollToArticleId", e);
        }
 }
 
-function cdmArticleIsAboveViewport(id) {
+function cdmWatchdog() {
+
        try {
+
                var ctr = $("headlinesInnerContainer");
-               var e = $("RROW-" + id);
 
-               if (!e || !ctr) return;
+               if (!ctr) return;
 
-               // article starts above viewport
+               var ids = new Array();
 
-               if (ctr.scrollTop > e.offsetTop + e.offsetHeight) {
-                       return true;
-               } else {        
-                       return false;
-               }
+               var e = ctr.firstChild;
 
-       } catch (e) {
-               exception_error("cdmArticleIsVisible", e);
-       }
-}
+               while (e) {
+                       if (e.className && e.hasClassName("Unread") && e.id &&
+                                       e.id.match("RROW-")) {
 
-function cdmScrollToArticleId(id) {
-       try {
-               var ctr = $("headlinesInnerContainer");
-               var e = $("RROW-" + id);
+                               // article fits in viewport OR article is longer than viewport and
+                               // its bottom is visible
 
-               if (!e || !ctr) return;
+                               if (ctr.scrollTop <= e.offsetTop && e.offsetTop + e.offsetHeight <=
+                                               ctr.scrollTop + ctr.offsetHeight) {
 
-               ctr.scrollTop = e.offsetTop;
-
-       } catch (e) {
-               exception_error("cdmScrollToArticleId", e);
-       }
-}
-
-function cdmArticleIsActuallyVisible(id) {
-       try {
-               var ctr = $("headlinesInnerContainer");
-               var e = $("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);
-       }
-}
-
-function cdmWatchdog() {
-
-       try {
-
-               var ctr = $("headlinesInnerContainer");
-
-               if (!ctr) return;
-
-               var ids = new Array();
-
-               var e = ctr.firstChild;
-
-               while (e) {
-                       if (e.className && e.className == "cdmArticleUnread" && e.id &&
-                                       e.id.match("RROW-")) {
-
-                               // 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) {
-
-//                                     debug(e.id + " is visible " + e.offsetTop + "." + 
-//                                             (e.offsetTop + e.offsetHeight) + " vs " + ctr.scrollTop + "." +
-//                                             (ctr.scrollTop + ctr.offsetHeight));
+//                                     console.log(e.id + " is visible " + e.offsetTop + "." + 
+//                                             (e.offsetTop + e.offsetHeight) + " vs " + ctr.scrollTop + "." +
+//                                             (ctr.scrollTop + ctr.offsetHeight));
 
                                        ids.push(e.id.replace("RROW-", ""));
 
@@ -1679,14 +1336,14 @@ function cdmWatchdog() {
                        e = e.nextSibling;
                }
 
-               debug("cdmWatchdog, ids= " + ids.toString());
+               console.log("cdmWatchdog, ids= " + ids.toString());
 
                if (ids.length > 0) {
 
                        for (var i = 0; i < ids.length; i++) {
                                var e = $("RROW-" + ids[i]);
                                if (e) {
-                                       e.className = e.className.replace("Unread", "");
+                                       e.removeClassName("Unread");
                                }
                        }
 
@@ -1696,7 +1353,7 @@ function cdmWatchdog() {
                        new Ajax.Request("backend.php", {
                                parameters: query,
                                onComplete: function(transport) { 
-                                       all_counters_callback2(transport); 
+                                       handle_rpc_reply(transport); 
                                } });
 
                }
@@ -1711,30 +1368,38 @@ function cdmWatchdog() {
 
 
 function cache_inject(id, article, param) {
+
        try {
                if (!cache_check_param(id, param)) {
-                       debug("cache_article: miss: " + id + " [p=" + param + "]");
-       
-                       if (db) {
+                       //console.log("cache_article: miss: " + id + " [p=" + param + "]");
+
+                  var date = new Date();
+             var ts = Math.round(date.getTime() / 1000);
 
-                          var date = new Date();
-                     var ts = Math.round(date.getTime() / 1000);
+                       if (db) {
 
                                db.execute("INSERT INTO cache (id, article, param, added) VALUES (?, ?, ?, ?)",
                                        [id, article, param, ts]);                              
                        } else {
        
-                               var cache_obj = new Array();
+                               var cache_obj = {};
        
                                cache_obj["id"] = id;
                                cache_obj["data"] = article;
                                cache_obj["param"] = param;
-       
-                               article_cache.push(cache_obj);
+
+                               if (param) id = id + ":" + param;
+
+                               cache_added["TS:" + id] = ts;
+
+                               if (has_local_storage()) 
+                                       localStorage.setItem(id, JSON.stringify(cache_obj));
+                               else
+                                       article_cache.push(cache_obj);
                        }
        
                } else {
-                       debug("cache_article: hit: " + id + " [p=" + param + "]");
+                       //console.log("cache_article: hit: " + id + " [p=" + param + "]");
                }
        } catch (e) {   
                exception_error("cache_inject", e);
@@ -1756,9 +1421,22 @@ function cache_find(id) {
                return a;
 
        } else {
-               for (var i = 0; i < article_cache.length; i++) {
-                       if (article_cache[i]["id"] == id) {
-                               return article_cache[i]["data"];
+
+               if (has_local_storage()) {
+                       var cache_obj = localStorage.getItem(id);
+       
+                       if (cache_obj) {
+                               cache_obj = JSON.parse(cache_obj);
+
+                               if (cache_obj)
+                                       return cache_obj['data'];
+                       }
+
+               } else {
+                       for (var i = 0; i < article_cache.length; i++) {
+                               if (article_cache[i]["id"] == id) {
+                                       return article_cache[i]["data"];
+                               }
                        }
                }
        }
@@ -1781,9 +1459,25 @@ function cache_find_param(id, param) {
                return a;
 
        } else {
-               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"];
+
+               if (has_local_storage()) {
+
+                       if (param) id = id + ":" + param;
+
+                       var cache_obj = localStorage.getItem(id);
+
+                       if (cache_obj) {
+                               cache_obj = JSON.parse(cache_obj);
+
+                               if (cache_obj)
+                                       return cache_obj['data'];
+                       }
+
+               } else {
+                       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"];
+                               }
                        }
                }
        }
@@ -1806,9 +1500,14 @@ function cache_check(id) {
                return a;
 
        } else {
-               for (var i = 0; i < article_cache.length; i++) {
-                       if (article_cache[i]["id"] == id) {
+               if (has_local_storage()) {
+                       if (localStorage.getItem(id))
                                return true;
+               } else {
+                       for (var i = 0; i < article_cache.length; i++) {
+                               if (article_cache[i]["id"] == id) {
+                                       return true;
+                               }
                        }
                }
        }
@@ -1831,9 +1530,19 @@ function cache_check_param(id, param) {
                return a;
 
        } else {
-               for (var i = 0; i < article_cache.length; i++) {
-                       if (article_cache[i]["id"] == id && article_cache[i]["param"] == param) {
+
+               if (has_local_storage()) {
+
+                       if (param) id = id + ":" + param;
+
+                       if (localStorage.getItem(id))
                                return true;
+
+               } else {
+                       for (var i = 0; i < article_cache.length; i++) {
+                               if (article_cache[i]["id"] == id && article_cache[i]["param"] == param) {
+                                       return true;
+                               }
                        }
                }
        }
@@ -1851,14 +1560,36 @@ function cache_expire() {
 
 
        } else {
-               while (article_cache.length > 25) {
-                       article_cache.shift();
+               if (has_local_storage()) {
+
+                       var date = new Date();
+                       var timestamp = Math.round(date.getTime() / 1000);
+
+                       for (var i = 0; i < localStorage.length; i++) {
+
+                               var id = localStorage.key(i);
+
+                               if (timestamp - cache_added["TS:" + id] > 180) {
+                                       localStorage.removeItem(id);
+                               }
+                       }
+
+               } else {
+                       while (article_cache.length > 25) {
+                               article_cache.shift();
+                       }
                }
        }
 }
 
 function cache_flush() {
-       article_cache = new Array();
+       if (db) {
+               db.execute("DELETE FROM cache");
+       } else if (has_local_storage()) {
+               localStorage.clear();
+       } else {
+               article_cache = new Array();
+       }
 }
 
 function cache_invalidate(id) {
@@ -1869,19 +1600,39 @@ function cache_invalidate(id) {
                        return rs.rowsAffected != 0;
                } else {
 
-                       var i = 0
+                       if (has_local_storage()) {
 
-                       while (i < article_cache.length) {
-                               if (article_cache[i]["id"] == id) {
-                                       debug("cache_invalidate: removed id " + id);
-                                       article_cache.splice(i, 1);
-                                       return true;
+                               var found = false;
+
+                               for (var i = 0; i < localStorage.length; i++) {
+                                       var key = localStorage.key(i);
+
+//                                     console.warn("cache_invalidate: " + key_id + " cmp " + id);
+
+                                       if (key == id || key.indexOf(id + ":") == 0) {
+                                               localStorage.removeItem(key);
+                                               found = true;
+                                               break;
+                                       }
+                               }
+
+                               return found;
+
+                       } else {
+                               var i = 0
+
+                               while (i < article_cache.length) {
+                                       if (article_cache[i]["id"] == id) {
+                                               //console.log("cache_invalidate: removed id " + id);
+                                               article_cache.splice(i, 1);
+                                               return true;
+                                       }
+                                       i++;
                                }
-                               i++;
                        }
                }
 
-               debug("cache_invalidate: id not found: " + id);
+               //console.log("cache_invalidate: id not found: " + id);
                return false;
        } catch (e) {
                exception_error("cache_invalidate", e);
@@ -1892,22 +1643,32 @@ function getActiveArticleId() {
        return active_post_id;
 }
 
-function cdmClicked(id) {
+function preloadBatchedArticles() {
        try {
-               var elem = $("RROW-" + id);
 
-               if (elem) {
-                       var id = elem.id.replace("RROW-", "");
-                       active_post_id = id;
+               var query = "?op=rpc&subop=getArticles&ids=" + 
+                       preload_id_batch.toString();
 
-//                     cdmSelectArticles("none");
-                       toggleUnread(id, 0, true);
-//                     toggleSelected(id);
+               new Ajax.Request("backend.php", {
+                       parameters: query,
+                       onComplete: function(transport) { 
+
+                               preload_id_batch = [];
+
+                               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);                             
+                                               console.log("preloaded article: " + id);
+                                       }
+                               }
+               } }); 
 
-               }
        } catch (e) {
-               exception_error("cdmClicked", e);
-       } 
+               exception_error("preloadBatchedArticles", e);
+       }
 }
 
 function preloadArticleUnderPointer(id) {
@@ -1916,39 +1677,28 @@ function preloadArticleUnderPointer(id) {
 
                if (post_under_pointer == id && !cache_check(id)) {
 
-                       debug("trying to preload article " + id);
+                       console.log("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]);
+                       if (preload_id_batch.indexOf(id) == -1) {
+                               for (var i = 0; i < neighbor_ids.length; i++) {
+                                       if (!cache_check(neighbor_ids[i])) {
+                                               preload_id_batch.push(neighbor_ids[i]);
+                                       }
                                }
                        }
-                       debug("additional ids: " + cids_to_request.toString());
 
-                       cids_to_request.push(id);
+                       if (preload_id_batch.indexOf(id) == -1)
+                               preload_id_batch.push(id);
 
-                       var query = "?op=rpc&subop=getArticles&ids=" + 
-                               cids_to_request.toString();
+                       //console.log("preload ids batch: " + preload_id_batch.toString());
 
-                       new Ajax.Request("backend.php", {
-                               parameters: query,
-                               onComplete: function(transport) { 
-                                       var articles = transport.responseXML.getElementsByTagName("article");
+                       window.clearTimeout(preload_timeout_id);
+                       preload_batch_timeout_id = window.setTimeout('preloadBatchedArticles()', 1000);
 
-                                       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("preloadArticleUnderPointer", e);
@@ -1984,12 +1734,11 @@ function headlines_scroll_handler() {
 
                var toolbar_form = document.forms["main_toolbar_form"];
 
-               debug((e.scrollTop + e.offsetHeight) + " vs " + e.scrollHeight + " dis? " +
-                       _infscroll_disable);
+//             console.log((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();
                        }
                }
@@ -2009,13 +1758,7 @@ function catchupRelativeToArticle(below) {
                        return;
                }
 
-               var visible_ids;
-
-               if ($("headlinesList")) {
-                       visible_ids = getVisibleHeadlineIds();
-               } else {
-                       visible_ids = cdmGetVisibleArticles();
-               }
+               var visible_ids = getVisibleArticleIds();
 
                var ids_to_mark = new Array();
 
@@ -2024,7 +1767,7 @@ function catchupRelativeToArticle(below) {
                                if (visible_ids[i] != getActiveArticleId()) {
                                        var e = $("RROW-" + visible_ids[i]);
 
-                                       if (e && e.className.match("Unread")) {
+                                       if (e && e.hasClassName("Unread")) {
                                                ids_to_mark.push(visible_ids[i]);
                                        }
                                } else {
@@ -2036,7 +1779,7 @@ function catchupRelativeToArticle(below) {
                                if (visible_ids[i] != getActiveArticleId()) {
                                        var e = $("RROW-" + visible_ids[i]);
 
-                                       if (e && e.className.match("Unread")) {
+                                       if (e && e.hasClassName("Unread")) {
                                                ids_to_mark.push(visible_ids[i]);
                                        }
                                } else {
@@ -2050,11 +1793,11 @@ function catchupRelativeToArticle(below) {
                } else {
                        var msg = __("Mark %d article(s) as read?").replace("%d", ids_to_mark.length);
 
-                       if (confirm(msg)) {
+                       if (getInitParam("confirm_feed_catchup") != 1 || confirm(msg)) {
 
                                for (var i = 0; i < ids_to_mark.length; i++) {
                                        var e = $("RROW-" + ids_to_mark[i]);
-                                       e.className = e.className.replace("Unread", "");
+                                       e.removeClassName("Unread");
                                }
 
                                var query = "?op=rpc&subop=catchupSelected" +
@@ -2074,126 +1817,107 @@ function catchupRelativeToArticle(below) {
        }
 }
 
-function cdmExpandArticle(a_id) {
+function cdmExpandArticle(id) {
        try {
-               var id = 'CICD-' + a_id;
 
-               try {
-                       Element.hide("CEXC-" + a_id);
-               } catch (e) { } 
+               hideAuxDlg();
 
-               Effect.Appear(id, {duration : 0.5, 
-                       beforeStart: function(effect) { 
-                               var h_id = 'CICH-' + a_id;
-                               var h_elem = $(h_id);
-                               if (h_elem) { h_elem.style.display = "none"; }
+               var elem = $("CICD-" + active_post_id);
 
-                               toggleUnread(a_id, 0);
-                       }});
+               var upd_img_pic = $("FUPDPIC-" + id);
 
+               if (upd_img_pic && (upd_img_pic.src.match("updated.png") || 
+                               upd_img_pic.src.match("fresh_sign.png"))) {
 
-       } catch (e) {
-               exception_error("appearBlockElementF", e);
-       }
+                       upd_img_pic.src = "images/blank_icon.gif";
+               }
 
-}
+               if (id == active_post_id && Element.visible(elem))
+                       return true;
 
-function fixHeadlinesOrder(ids) {
-       try {
-               for (var i = 0; i < ids.length; i++) {
-                       var e = $("RROW-" + ids[i]);
+               selectArticles("none");
 
-                       if (e) {
-                               if (i % 2 == 0) {
-                                       e.className = e.className.replace("even", "odd");
-                               } else {
-                                       e.className = e.className.replace("odd", "even");
-                               }
-                       }
+               var old_offset = $("RROW-" + id).offsetTop;
+
+               if (active_post_id && elem && !getInitParam("cdm_expanded")) {
+                       Element.hide(elem);
+                       Element.show("CEXC-" + active_post_id);
                }
-       } catch (e) {
-               exception_error("fixHeadlinesOrder", e);
-       }
-}
 
-function hideReadHeadlines() {
-       try {
+               active_post_id = id;
 
-               var ids = false;
-               var vis_ids = new Array();
+               elem = $("CICD-" + id);
 
-               if ($("headlinesList")) {
-                       ids = getVisibleHeadlineIds();
-               } else {
-                       ids = cdmGetVisibleArticles();
-               }
+               if (!Element.visible(elem)) {
+                       Element.show(elem);
+                       Element.hide("CEXC-" + id);
 
-               var read_headlines_visible = true;
+                       if ($("CWRAP-" + id).innerHTML == "") {
 
-               for (var i = 0; i < ids.length; i++) {
-                       var row = $("RROW-" + ids[i]);
+                               $("FUPDPIC-" + id).src = "images/indicator_tiny.gif";
 
-                       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]);
-                               }
+                               $("CWRAP-" + id).innerHTML = "<div class=\"insensitive\">" + 
+                                       __("Loading, please wait...") + "</div>";
+       
+                               var query = "?op=rpc&subop=cdmGetArticle&id=" + param_escape(id);
+       
+                               //console.log(query);
+       
+                               new Ajax.Request("backend.php", {
+                                       parameters: query,
+                                       onComplete: function(transport) { 
+                                               $("FUPDPIC-" + id).src = 'images/blank_icon.gif';
+       
+                                               if (transport.responseXML) {
+                                                       var article = transport.responseXML.getElementsByTagName("article")[0];
+                                                       var recv_id = article.getAttribute("id");
+       
+                                                       if (recv_id == id)
+                                                               $("CWRAP-" + id).innerHTML = article.firstChild.nodeValue;
+       
+                                               } else {
+                                                       $("CWRAP-" + id).innerHTML = __("Unable to load article.");
+       
+                                               }
+                               }});
+       
                        }
                }
-               
-               fixHeadlinesOrder(vis_ids);
 
-               read_headlines_visible = !read_headlines_visible;
+               var new_offset = $("RROW-" + id).offsetTop;
+
+               $("headlinesInnerContainer").scrollTop += (new_offset-old_offset);
+
+               if ($("RROW-" + id).offsetTop != old_offset) 
+                       $("headlinesInnerContainer").scrollTop = new_offset;
+
+               toggleUnread(id, 0, true);
+               toggleSelected(id);
 
        } catch (e) {
-               exception_error("hideReadHeadlines", e);
-       } 
+               exception_error("cdmExpandArticle", e);
+       }
+
+       return false;
 }
 
-function invertHeadlineSelection() {
+function fixHeadlinesOrder(ids) {
        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 = $("RCHK-" + id);
+               for (var i = 0; i < ids.length; i++) {
+                       var e = $("RROW-" + ids[i]);
 
-                       if (!rows[i].className.match("Selected")) {
-                               nc = nc + "Selected";
-                               cb.checked = true;
-                       } else {
-                               nc = nc.replace("Selected", "");
-                               cb.checked = false;
+                       if (e) {
+                               if (i % 2 == 0) {
+                                       e.removeClassName("even");
+                                       e.addClassName("odd");
+                               } else {
+                                       e.removeClassName("odd");
+                                       e.addClassName("even");
+                               }
                        }
-
-                       rows[i].className = nc;
-
                }
-
        } catch (e) {
-               exception_error("invertHeadlineSelection", e);
+               exception_error("fixHeadlinesOrder", e);
        }
 }
 
@@ -2212,43 +1936,6 @@ function zoomToArticle(id) {
        }
 }
 
-function showOriginalArticleInline(id) {
-       try {
-
-               var query = "?op=rpc&subop=getArticleLink&id=" + id;
-
-               notify_progress("Loading, please wait...", true);
-
-               new Ajax.Request("backend.php", {
-                       parameters: 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 = $("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()) {
@@ -2330,3 +2017,359 @@ function publishWithNote(id, def_note) {
                exception_error("publishWithNote", e);
        }
 }
+
+function emailArticle(id) {
+       try {
+               if (!id) {
+                       var ids = getSelectedArticleIds2();
+
+                       if (ids.length == 0) {
+                               alert(__("No articles are selected."));
+                               return;
+                       }
+
+                       id = ids.toString();
+               }
+
+               displayDlg('emailArticle', id, 
+                  function () {                                
+                               document.forms['article_email_form'].destination.focus();
+
+                          new Ajax.Autocompleter('destination', 'destination_choices',
+                                  "backend.php?op=rpc&subop=completeEmails",
+                                  { tokens: '', paramName: "search" });
+
+                       });
+
+       } catch (e) {
+               exception_error("emailArticle", e);
+       }
+}
+
+function emailArticleDo() {
+       try {
+               var f = document.forms['article_email_form'];
+
+               if (f.destination.value == "") {
+                       alert("Please fill in the destination email.");
+                       return;
+               }
+
+               if (f.subject.value == "") {
+                       alert("Please fill in the subject.");
+                       return;
+               }
+
+               var query = Form.serialize("article_email_form");
+
+//             console.log(query);
+
+               new Ajax.Request("backend.php", {
+                       parameters: query,
+                       onComplete: function(transport) { 
+                               try {
+
+                                       var error = transport.responseXML.getElementsByTagName('error')[0];
+
+                                       if (error) {
+                                               alert(__('Error sending email:') + ' ' + error.firstChild.nodeValue);
+                                       } else {
+                                               notify_info('Your message has been sent.');
+                                               closeInfoBox();
+                                       }
+
+                               } catch (e) {
+                                       exception_error("sendEmailDo", e);
+                               }
+
+                       } });
+
+       } catch (e) {
+               exception_error("emailArticleDo", e);
+       }
+}
+
+function dismissArticle(id) {
+       try {
+               var elem = $("RROW-" + id);
+
+               toggleUnread(id, 0, true);
+
+               new Effect.Fade(elem, {duration : 0.5});
+
+               active_post_id = false;
+
+       } catch (e) {
+               exception_error("dismissArticle", e);
+       }
+}
+
+function dismissSelectedArticles() {
+       try {
+
+               var ids = getVisibleArticleIds();
+               var tmp = [];
+               var sel = [];
+
+               for (var i = 0; i < ids.length; i++) {
+                       var elem = $("RROW-" + ids[i]);
+
+                       if (elem.className && elem.hasClassName("Selected") && 
+                                       ids[i] != active_post_id) {
+                               new Effect.Fade(elem, {duration : 0.5});
+                               sel.push(ids[i]);
+                       } else {
+                               tmp.push(ids[i]);
+                       }
+               }
+
+               if (sel.length > 0)
+                       selectionToggleUnread(false);
+
+               fixHeadlinesOrder(tmp);
+
+       } catch (e) {
+               exception_error("dismissSelectedArticles", e);
+       }
+}
+
+function dismissReadArticles() {
+       try {
+
+               var ids = getVisibleArticleIds();
+               var tmp = [];
+
+               for (var i = 0; i < ids.length; i++) {
+                       var elem = $("RROW-" + ids[i]);
+
+                       if (elem.className && !elem.hasClassName("Unread") && 
+                                       !elem.hasClassName("Selected")) {
+                       
+                               new Effect.Fade(elem, {duration : 0.5});
+                       } else {
+                               tmp.push(ids[i]);
+                       }
+               }
+
+               fixHeadlinesOrder(tmp);
+
+       } catch (e) {
+               exception_error("dismissSelectedArticles", e);
+       }
+}
+
+function getVisibleArticleIds() {
+       var ids = [];
+
+       try {
+               
+               getLoadedArticleIds().each(function(id) {
+                       var elem = $("RROW-" + id);
+                       if (elem && Element.visible(elem))
+                               ids.push(id);
+                       });
+
+       } catch (e) {
+               exception_error("getVisibleArticleIds", e);
+       }
+
+       return ids;
+}
+
+function cdmClicked(event, id) {
+       try {
+               var shift_key = event.shiftKey;
+
+               hideAuxDlg();
+
+               if (!event.ctrlKey) {
+                       selectArticles("none");
+                       toggleSelected(id);
+
+                       var elem = $("RROW-" + id);
+
+                       if (elem)
+                               elem.removeClassName("Unread");
+
+                       var upd_img_pic = $("FUPDPIC-" + id);
+
+                       if (upd_img_pic && (upd_img_pic.src.match("updated.png") || 
+                                       upd_img_pic.src.match("fresh_sign.png"))) {
+
+                               upd_img_pic.src = "images/blank_icon.gif";
+                       }
+
+                       active_post_id = id;
+
+                       var query = "?op=rpc&subop=catchupSelected" +
+                               "&cmode=0&ids=" + param_escape(id);
+
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
+                               onComplete: function(transport) { 
+                                       handle_rpc_reply(transport); 
+                               } });
+
+                       return true;
+               } else {
+                       toggleSelected(id);
+               }
+
+       } catch (e) {
+               exception_error("cdmClicked");
+       }
+
+       return false;
+}
+
+function hlClicked(event, id) {
+       try {
+
+               if (!event.ctrlKey) {
+                       view(id);
+                       return true;
+               } else {
+                       toggleSelected(id);
+                       return false;
+               }
+
+       } catch (e) {
+               exception_error("hlClicked");
+       }
+
+       return false;
+}
+
+function getFirstVisibleHeadlineId() {
+       var rows = getVisibleArticleIds();
+       return rows[0];
+       
+}
+
+function getLastVisibleHeadlineId() {
+       var rows = getVisibleArticleIds();
+       return rows[rows.length-1];
+}
+
+function openArticleInNewWindow(id) {
+       try {
+               console.log("openArticleInNewWindow: " + id);
+
+               var query = "?op=rpc&subop=getArticleLink&id=" + id;
+               var wname = "ttrss_article_" + id;
+
+               console.log(query + " " + wname);
+
+               var w = window.open("", wname);
+
+               if (!w) notify_error("Failed to open window for the article");
+
+               new Ajax.Request("backend.php", {
+                       parameters: query,
+                       onComplete: function(transport) { 
+
+                                       var link = transport.responseXML.getElementsByTagName("link")[0];
+                                       var id = transport.responseXML.getElementsByTagName("id")[0];
+               
+                                       console.log("open_article received link: " + link);
+               
+                                       if (link && id) {
+               
+                                               var wname = "ttrss_article_" + id.firstChild.nodeValue;
+               
+                                               console.log("link url: " + link.firstChild.nodeValue + ", wname " + wname);
+               
+                                               var w = window.open(link.firstChild.nodeValue, wname);
+               
+                                               if (!w) { notify_error("Failed to load article in new window"); }
+               
+                                               if (id) {
+                                                       id = id.firstChild.nodeValue;
+                                                       window.setTimeout("toggleUnread(" + id + ", 0)", 100);
+                                               }
+                                       } else {
+                                               notify_error("Can't open article: received invalid article link");
+                                       }
+                               } });
+
+       } catch (e) {
+               exception_error("openArticleInNewWindow", e);
+       }
+}
+
+function isCdmMode() {
+       return getInitParam("combined_display_mode");
+}
+
+function markHeadline(id) {
+       var row = $("RROW-" + id);
+       if (row) {
+               var check = $("RCHK-" + id);
+
+               if (check) {
+                       check.checked = true;
+               }
+
+               row.addClassName("Selected");
+       }
+}
+
+function getRelativePostIds(id, limit) {
+
+       var tmp = [];
+
+       try {
+
+               if (!limit) limit = 3;
+       
+               var ids = getVisibleArticleIds();
+       
+               for (var i = 0; i < ids.length; i++) {
+                       if (ids[i] == id) {
+                               for (var k = 1; k <= limit; k++) {
+                                       if (i > k-1) tmp.push(ids[i-k]);
+                                       if (i < ids.length-k) tmp.push(ids[i+k]);
+                               }
+                               break;
+                       }
+               }
+
+       } catch (e) {
+               exception_error("getRelativePostIds", e);
+       }
+
+       return tmp;
+}
+
+function correctHeadlinesOffset(id) {
+       
+       try {
+
+               var container = $("headlinesInnerContainer");
+               var row = $("RROW-" + id);
+       
+               var viewport = container.offsetHeight;
+       
+               var rel_offset_top = row.offsetTop - container.scrollTop;
+               var rel_offset_bottom = row.offsetTop + row.offsetHeight - container.scrollTop;
+       
+               //console.log("Rtop: " + rel_offset_top + " Rbtm: " + rel_offset_bottom);
+               //console.log("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 */
+
+                       container.scrollTop = row.offsetTop + row.offsetHeight - viewport;              
+               } 
+
+       } catch (e) {
+               exception_error("correctHeadlinesOffset", e);
+       }
+
+}
+
+