]> git.wh0rd.org - tt-rss.git/blobdiff - viewfeed.js
viewfeed: do not return sync counters on subop
[tt-rss.git] / viewfeed.js
index d12e953809fca892d544c17ba031e8f075f2ba0d..3a21323da1f208b92d8bd2811d298796d7e1c8c7 100644 (file)
@@ -2,12 +2,6 @@ var active_post_id = false;
 var last_article_view = false;
 var active_real_feed_id = false;
 
-// FIXME: kludges, needs proper implementation
-var _reload_feedlist_after_view = false;
-
-var _cdm_wd_timeout = false;
-var _cdm_wd_vishist = new Array();
-
 var article_cache = new Array();
 
 var vgroup_last_feed = false;
@@ -15,232 +9,160 @@ var post_under_pointer = false;
 
 var last_requested_article = false;
 
-function catchup_callback2(transport, callback) {
-       try {
-               console.log("catchup_callback2 " + transport + ", " + callback);
-               notify("");                     
-               all_counters_callback2(transport);
-               if (callback) {
-                       setTimeout(callback, 10);       
-               }
-       } catch (e) {
-               exception_error("catchup_callback2", e, transport);
-       }
-}
-
-function clean_feed_selections() {
-       try {
-               var feeds = $("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);
-       }
-}
+var preload_id_batch = [];
+var preload_timeout_id = false;
 
-function headlines_callback2(transport, feed_cur_page) {
-       try {
+var cache_added = [];
 
-               if (!transport.responseText && db) {
-                       offlineConfirmModeChange();
-                       return;
-               }
+var catchup_id_batch = [];
+var catchup_timeout_id = false;
 
-               loading_set_progress(100);
+function headlines_callback2(transport, offset) {
+       try {
+               handle_rpc_json(transport);
 
-               console.log("headlines_callback2 [page=" + feed_cur_page + "]");
+               loading_set_progress(25);
 
-               if (!transport_error_check(transport)) return;
+               console.log("headlines_callback2 [offset=" + offset + "]");
 
-               clean_feed_selections();
-       
                var is_cat = false;
                var feed_id = false;
 
-               if (transport.responseXML) {
-                       var headlines = transport.responseXML.getElementsByTagName("headlines")[0];
-                       if (headlines) {
-                               is_cat = headlines.getAttribute("is_cat");
-                               feed_id = headlines.getAttribute("id");
-                               setActiveFeedId(feed_id, is_cat);
-                       }
-               }
-
-               var ll = $('FLL-' + feed_id);
+               var reply;
 
-               if (!is_cat) {
-                       var feedr = $("FEEDR-" + feed_id);
-                       if (feedr && !feedr.className.match("Selected")) {      
-                               feedr.className = feedr.className + "Selected";
-                       } 
-                       if (feedr && ll) feedr.removeChild(ll);
-               } else {
-                       var feedr = $("FCAT-" + feed_id);
-                       if (feedr && !feedr.className.match("Selected")) {      
-                               feedr.className = feedr.className + "Selected";
-                       } 
+               try {
+                       reply = JSON.parse(transport.responseText);
+               } catch (e) {
+                       console.error(e);
+               }
 
-                       var fcap = $("FCAP-" + feed_id);
-                       if (fcap && ll) fcap.removeChild(ll);
+               if (reply) {
 
-               }
+                       is_cat = reply['headlines']['is_cat'];
+                       feed_id = reply['headlines']['id'];
 
-               var img = $('FIMG-' + feed_id);
+                       setActiveFeedId(feed_id, is_cat);
 
-               if (img && !is_cat) {
-                       img.src = img.alt;
-               }
+                       var update_btn = document.forms["main_toolbar_form"].update;
 
-               var f = $("headlines-frame");
-               try {
-                       if (feed_cur_page == 0) { 
-                               console.log("resetting headlines scrollTop");
-                               f.scrollTop = 0; 
-                       }
-               } catch (e) { };
-       
-               if (transport.responseXML) {
-                       var response = transport.responseXML;
+                       update_btn.disabled = !(feed_id >= 0 && !is_cat);
 
-                       var headlines = response.getElementsByTagName("headlines")[0];
-                       var headlines_info = response.getElementsByTagName("headlines-info")[0];
+                       try {
+                               if (offset == 0) {
+                                       $("headlines-frame").scrollTop = 0;
+                               }
+                       } catch (e) { };
 
-                       if (headlines_info)
-                               headlines_info = JSON.parse(headlines_info.firstChild.nodeValue);
-                       else
-                               console.log("didn't find headlines-info object in response");
+                       var headlines_count = reply['headlines-info']['count'];
+                       var headlines_unread = reply['headlines-info']['unread'];
 
-                       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;
+                       vgroup_last_feed = reply['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 = response.getElementsByTagName("counters")[0];
-                       var articles = response.getElementsByTagName("article");
-                       var runtime_info = response.getElementsByTagName("runtime-info");
-       
-                       if (feed_cur_page == 0) {
-                               if (headlines) {
-                                       f.innerHTML = headlines.firstChild.nodeValue;
+                       var counters = reply['counters'];
+                       var articles = reply['articles'];
+                       var runtime_info = reply['runtime-info'];
 
-                                       var cache_prefix = "";
+                       if (offset == 0) {
+                               dijit.byId("headlines-frame").attr('content',
+                                       reply['headlines']['content']);
 
-                                       if (is_cat) {
-                                               cache_prefix = "C:";
-                                       } else {
-                                               cache_prefix = "F:";
-                                       }
+                               dijit.byId("headlines-toolbar").attr('content',
+                                       reply['headlines']['toolbar']);
 
-                                       cache_invalidate(cache_prefix + feed_id);
+                               var hsp = $("headlines-spacer");
+                               if (!hsp) hsp = new Element("DIV", {"id": "headlines-spacer"});
 
-                                       if (!disable_cache) {
-                                               cache_inject(cache_prefix + feed_id,
-                                                       headlines.firstChild.nodeValue, headlines_unread);
-                                       }
+/*                             if (!_infscroll_disable)
+                                       hsp.innerHTML = "<img src='images/indicator_tiny.gif'> " +
+                                               __("Loading, please wait..."); */
+
+                               dijit.byId('headlines-frame').domNode.appendChild(hsp);
+
+                               initHeadlinesMenu();
 
-                               } else {
-                                       console.log("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) {
-                                               console.log("adding some more headlines...");
-       
-                                               var c = $("headlinesList");
-               
-                                               if (!c) {
-                                                       c = $("headlinesInnerContainer");
-                                               }
+                               if (headlines_count > 0) {
+                                       console.log("adding some more headlines...");
 
-                                               var ids = getSelectedArticleIds2();
-       
-                                               c.innerHTML = c.innerHTML + headlines.firstChild.nodeValue;
+                                       var c = dijit.byId("headlines-frame");
+                                       var ids = getSelectedArticleIds2();
 
-                                               console.log("restore selected ids: " + ids);
+                                       $("headlines-tmp").innerHTML = reply['headlines']['content'];
 
-                                               for (var i = 0; i < ids.length; i++) {
-                                                       markHeadline(ids[i]);
-                                               }
+                                       var hsp = $("headlines-spacer");
 
-                                       } else {
-                                               console.log("no new headlines received");
+                                       if (hsp)
+                                               c.domNode.removeChild(hsp);
+
+                                       $$("#headlines-tmp > div").each(function(row) {
+                                               row.style.display = 'none';
+                                               c.domNode.appendChild(row);
+                                       });
+
+                                       if (!hsp) hsp = new Element("DIV", {"id": "headlines-spacer"});
+
+/*                                     if (!_infscroll_disable)
+                                               hsp.innerHTML = "<img src='images/indicator_tiny.gif'> " +
+                                                       __("Loading, please wait..."); */
+
+                                       fixHeadlinesOrder(getLoadedArticleIds());
+
+                                       c.domNode.appendChild(hsp);
+
+                                       console.log("restore selected ids: " + ids);
+
+                                       for (var i = 0; i < ids.length; i++) {
+                                               markHeadline(ids[i]);
                                        }
+
+                                       initHeadlinesMenu();
+
+                                       $$("#headlines-frame > div[id*=RROW]").each(
+                                       function(child) {
+                                               if (!Element.visible(child))
+                                                       new Effect.Appear(child, { duration : 0.5 });
+                                       });
+
                                } else {
-                                       console.log("headlines_callback: returned no data");
-                                       notify_error("Error while trying to load more headlines");      
-                               }
+                                       console.log("no new headlines received");
+
+                                       var hsp = $("headlines-spacer");
 
+                                       if (hsp) hsp.innerHTML = "";
+                               }
                        }
-       
+
                        if (articles) {
                                for (var i = 0; i < articles.length; i++) {
-                                       var a_id = articles[i].getAttribute("id");
-                                       console.log("found id: " + a_id);
-                                       cache_inject(a_id, articles[i].firstChild.nodeValue);
+                                       var a_id = articles[i]['id'];
+                                       cache_inject(a_id, articles[i]['content']);
                                }
                        } else {
                                console.log("no cached articles received");
                        }
-       
-                       if (counters) {
-                               console.log("parsing piggybacked counters: " + counters);
-                               parse_counters(counters, false);
-                       } else {
-                               console.log("counters container not found in reply, requesting...");
+
+                       if (counters)
+                               parse_counters(counters);
+                       else
                                request_counters();
-                       }
-       
-                       if (runtime_info) {
-                               console.log("parsing runtime info: " + runtime_info[0]);
-                               parse_runtime_info(runtime_info[0]);
-                       } else {
-                               console.log("counters container not found in reply");
-                       }
-       
-               } else {
-                       console.log("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") && 
-                               getActiveFeedId() != -3 &&
-                               getInitParam("cdm_auto_catchup") == 1) {
-                       console.log("starting CDM watchdog");
-                       _cdm_wd_timeout = window.setTimeout("cdmWatchdog()", 5000);
-                       _cdm_wd_vishist = new Array();
+
                } else {
-                       console.log("not in CDM mode or watchdog disabled");
+                       console.warn("headlines_callback: returned no XML object");
+                       dijit.byId("headlines-frame").attr('content', "<div class='whiteBox'>" +
+                                       __('Could not update headlines (invalid object received)') + "</div>");
                }
-       
-               _feed_cur_page = feed_cur_page;
+
+               //_feed_cur_page = feed_cur_page;
                _infscroll_request_sent = 0;
 
                notify("");
 
-               remove_splash();
-
        } catch (e) {
                exception_error("headlines_callback2", e, transport);
        }
@@ -248,20 +170,22 @@ function headlines_callback2(transport, feed_cur_page) {
 
 function render_article(article) {
        try {
-               var f = $("content-frame");
+               dijit.byId("headlines-wrap-inner").addChild(
+                               dijit.byId("content-insert"));
+
+               var c = dijit.byId("content-insert");
+
                try {
-                       f.scrollTop = 0;
+                       c.domNode.scrollTop = 0;
                } catch (e) { };
 
-               var fi = $("content-insert");
+               c.attr('content', article);
+
+               correctHeadlinesOffset(getActiveArticleId());
 
                try {
-                       fi.scrollTop = 0;
+                       c.focus();
                } catch (e) { };
-               
-               fi.innerHTML = article;
-               
-//             article.evalScripts();          
 
        } catch (e) {
                exception_error("render_article", e);
@@ -272,22 +196,22 @@ function showArticleInHeadlines(id) {
 
        try {
 
-               cleanSelected("headlinesList");
-       
+               selectArticles("none");
+
                var crow = $("RROW-" + id);
 
                if (!crow) return;
 
-               var article_is_unread = crow.className.match("Unread");
-                       
-               crow.className = crow.className.replace("Unread", "");
+               var article_is_unread = crow.hasClassName("Unread");
+
+               crow.removeClassName("Unread");
+
+               selectArticles('none');
 
-               selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', false);
-       
                var upd_img_pic = $("FUPDPIC-" + id);
 
                var cache_prefix = "";
-                               
+
                if (activeFeedIsCat()) {
                        cache_prefix = "C:";
                } else {
@@ -297,30 +221,30 @@ function showArticleInHeadlines(id) {
                var view_mode = false;
 
                try {
-                       view_mode = document.forms['main_toolbar_form'].view_mode;      
+                       view_mode = document.forms['main_toolbar_form'].view_mode;
                        view_mode = view_mode[view_mode.selectedIndex].value;
                } catch (e) {
                        //
                }
 
-               if (upd_img_pic && (upd_img_pic.src.match("updated.png") || 
+               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";
 
                        cache_invalidate(cache_prefix + getActiveFeedId());
 
-                       cache_inject(cache_prefix + getActiveFeedId(),
+                       /* cache_inject(cache_prefix + getActiveFeedId(),
                                $("headlines-frame").innerHTML,
-                               get_feed_unread(getActiveFeedId()));
+                               getFeedUnread(getActiveFeedId())); */
 
                } else if (article_is_unread && view_mode == "all_articles") {
 
                        cache_invalidate(cache_prefix + getActiveFeedId());
 
-                       cache_inject(cache_prefix + getActiveFeedId(),
+                       /* cache_inject(cache_prefix + getActiveFeedId(),
                                $("headlines-frame").innerHTML,
-                               get_feed_unread(getActiveFeedId())-1);
+                               getFeedUnread(getActiveFeedId())-1); */
 
                } else if (article_is_unread) {
                        cache_invalidate(cache_prefix + getActiveFeedId());
@@ -328,6 +252,9 @@ function showArticleInHeadlines(id) {
 
                markHeadline(id);
 
+               if (article_is_unread)
+                       _force_scheduled_update = true;
+
        } catch (e) {
                exception_error("showArticleInHeadlines", e);
        }
@@ -337,88 +264,38 @@ function article_callback2(transport, id) {
        try {
                console.log("article_callback2 " + id);
 
-               if (!transport.responseText && db) {
-                       offlineConfirmModeChange();
-                       return;
-               }
-
-               if (transport.responseXML) {
-
-                       if (!transport_error_check(transport)) return;
+               handle_rpc_json(transport);
 
-/*                     var ll = $('LL-' + id);
-                       var content = $('HLC-' + id);
+               var reply = JSON.parse(transport.responseText);
 
-                       if (ll && content) content.removeChild(ll); */
-                       
+               if (reply) {
                        var upic = $('FUPDPIC-' + id);
 
-                       if (upic) {
-                               upic.src = 'images/blank_icon.gif';
-                       }
+                       if (upic) upic.src = 'images/blank_icon.gif';
 
                        if (id != last_requested_article) {
                                console.log("requested article id is out of sequence, aborting");
                                return;
                        }
 
-                       active_post_id = id; 
-
-                       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");
-
-                               console.log("found id: " + a_id);
-
-                               if (a_id == active_post_id) {
-                                       console.log("active article, rendering...");                                    
-                                       render_article(articles[i].firstChild.nodeValue);
+                       reply.each(function(article) {
+                               if (active_post_id == article['id']) {
+                                       render_article(article['content']);
                                }
+                               cache_inject(article['id'], article['content']);
+                       });
 
-                               cache_inject(a_id, articles[i].firstChild.nodeValue);
-                       }
-
-
-                       showArticleInHeadlines(id);     
-
-                       if (db) {
-                               db.execute("UPDATE articles SET unread = 0 WHERE id = ?", [id]);
-                       }
-
-                       var reply = transport.responseXML.firstChild.firstChild;
-               
                } else {
-                       console.log("article_callback: returned no XML object");
-                       //var f = $("content-frame");
-                       //f.innerHTML = "<div class='whiteBox'>" + __('Could not display article (missing XML object)') + "</div>";
+                       console.warn("article_callback: returned invalid data");
+
+                       render_article("<div class='whiteBox'>" +
+                                       __('Could not display article (invalid data received)') + "</div>");
                }
 
                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) {
-                                       console.log("parsing piggybacked counters: " + counters);
-                                       parse_counters(counters, false);
-                               } else {
-                                       console.log("counters container not found in reply, requesting...");
-                                       request_counters();
-                               }
-                       }
-               }
+               request_counters();
 
                notify("");
        } catch (e) {
@@ -430,13 +307,10 @@ function view(id) {
        try {
                console.log("loading article: " + id);
 
-               if (offline_mode) return view_offline(id);
-
                var cached_article = cache_find(id);
 
                console.log("cache check result: " + (cached_article != false));
-       
-               enableHotkeys();
+
                hideAuxDlg();
 
                var query = "?op=view&id=" + param_escape(id);
@@ -453,32 +327,21 @@ function view(id) {
                        }
                }
 
-               console.log("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) {
 
                        var upic = $('FUPDPIC-' + id);
 
-                       if (upic) {     
+                       if (upic) {
                                upic.src = getInitParam("sign_progress");
                        }
 
@@ -499,10 +362,12 @@ function view(id) {
 
                last_requested_article = id;
 
+               console.log(query);
+
                new Ajax.Request("backend.php", {
                        parameters: query,
-                       onComplete: function(transport) { 
-                               article_callback2(transport, id); 
+                       onComplete: function(transport) {
+                               article_callback2(transport, id);
                        } });
 
                return false;
@@ -520,98 +385,31 @@ function tPub(id) {
        return togglePub(id);
 }
 
-function tMark_afh_off(effect) {
-       try {
-               var elem = effect.effects[0].element;
-
-               console.log("tMark_afh_off : " + elem.id);
-
-               if (elem) {
-                       elem.src = elem.src.replace("mark_set", "mark_unset");
-                       elem.alt = __("Star article");
-                       Element.show(elem);
-               }
-
-       } catch (e) {
-               exception_error("tMark_afh_off", e);
-       }
-}
-
-function tPub_afh_off(effect) {
-       try {
-               var elem = effect.effects[0].element;
-
-               console.log("tPub_afh_off : " + elem.id);
-
-               if (elem) {
-                       elem.src = elem.src.replace("pub_set", "pub_unset");
-                       elem.alt = __("Publish article");
-                       Element.show(elem);
-               }
-
-       } catch (e) {
-               exception_error("tPub_afh_off", e);
-       }
-}
-
-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);
 
-               if (!mark_img) return;
+               var img = $("FMPIC-" + id);
 
-               var vfeedu = $("FEEDU--1");
-               var crow = $("RROW-" + id);
-       
-               if (mark_img.src.match("mark_unset")) {
-                       mark_img.src = mark_img.src.replace("mark_unset", "mark_set");
-                       mark_img.alt = __("Unstar article");
-                       query = query + "&mark=1";
+               if (!img) return;
 
-                       if (db) {
-                               db.execute("UPDATE articles SET marked = 1 WHERE id = ?", [id]);
-                       }
+               if (img.src.match("mark_unset")) {
+                       img.src = img.src.replace("mark_unset", "mark_set");
+                       img.alt = __("Unstar article");
+                       query = query + "&mark=1";
 
                } else {
-                       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();
-
                if (!client_only) {
-                       console.log(query);
-
                        new Ajax.Request("backend.php", {
                                parameters: query,
-                               onComplete: function(transport) { 
-                                       all_counters_callback2(transport); 
+                               onComplete: function(transport) {
+                                       handle_rpc_json(transport);
                                } });
-
                }
 
        } catch (e) {
@@ -620,76 +418,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 (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) return;
+
+               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.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);
-               
-                                       var note = transport.responseXML.getElementsByTagName("note")[0];
-               
-                                       if (note) {
-                                               var note_id = note.getAttribute("id");
-                                               var note_size = note.getAttribute("size");
-                                               var note_content = note.firstChild.nodeValue;
-               
-                                               var container = $('POSTNOTE-' + note_id);
-               
-                                               cache_invalidate(note_id);
-               
-                                               if (container) {
-                                                       if (note_size == "0") {
-                                                               Element.hide(container);
-                                                       } else {
-                                                               container.innerHTML = note_content;
-                                                               Element.show(container);
-                                                       }
-                                               }
-                                       }       
-
+                               onComplete: function(transport) {
+                                       handle_rpc_json(transport);
                                } });
                }
 
@@ -698,73 +456,35 @@ 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;
-       
-               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);
-       }
-
-}
-
 function moveToPost(mode) {
 
        try {
 
-               var rows;
+               var rows = getVisibleArticleIds();
 
-               if (isCdmMode()) {
-                       rows = cdmGetVisibleArticles();
-               } else {
-                       rows = getVisibleHeadlineIds();
-               }
-               
                var prev_id = false;
                var next_id = false;
-               
+
                if (!$('RROW-' + active_post_id)) {
                        active_post_id = false;
                }
-               
+
                if (active_post_id == false) {
                        next_id = getFirstVisibleHeadlineId();
                        prev_id = getLastVisibleHeadlineId();
-               } else {        
+               } else {
                        for (var i = 0; i < rows.length; i++) {
                                if (rows[i] == active_post_id) {
                                        prev_id = rows[i-1];
-                                       next_id = rows[i+1];                    
+                                       next_id = rows[i+1];
                                }
                        }
                }
-               
+
                if (mode == "next") {
                        if (next_id) {
                                if (isCdmMode()) {
-       
+
                                        cdmExpandArticle(next_id);
                                        cdmScrollToArticleId(next_id);
 
@@ -774,7 +494,7 @@ function moveToPost(mode) {
                                }
                        }
                }
-               
+
                if (mode == "prev") {
                        if (prev_id) {
                                if (isCdmMode()) {
@@ -785,39 +505,27 @@ function moveToPost(mode) {
                                        view(prev_id, getActiveFeedId());
                                }
                        }
-               } 
+               }
 
        } catch (e) {
                exception_error("moveToPost", e);
        }
 }
 
-function toggleSelected(id) {
+function toggleSelected(id, force_on) {
        try {
-       
-               var cb = $("RCHK-" + id);
 
+               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') && !force_on) {
+                               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);
@@ -833,76 +541,41 @@ function toggleUnread_afh(effect) {
        } catch (e) {
                exception_error("toggleUnread_afh", e);
        }
-} 
+}
 
 function toggleUnread(id, cmode, effect) {
        try {
-       
+
                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",
                                                        afterFinish: toggleUnread_afh,
                                                        queue: { position:'end', scope: 'TMRQ-' + id, limit: 1 } } );
-                                       } 
+                                       }
 
                                } else {
-                                       row.className = nc + "Unread";
-                               }
-
-                               if (db) {
-                                       db.execute("UPDATE articles SET unread = not unread "+
-                                               "WHERE id = ?", [id]);
+                                       row.addClassName("Unread");
                                }
 
                        } else if (cmode == 0) {
-                               row.className = nc;
+
+                               row.removeClassName("Unread");
 
                                if (effect) {
                                        new Effect.Highlight(row, {duration: 1, startcolor: "#fff7d5",
                                                afterFinish: toggleUnread_afh,
                                                queue: { position:'end', scope: 'TMRQ-' + id, limit: 1 } } );
-                               } 
-
-                               if (db) {
-                                       db.execute("UPDATE articles SET unread = 0 "+
-                                               "WHERE id = ?", [id]);
                                }
 
                        } else if (cmode == 1) {
-                               row.className = nc + "Unread";
-
-                               if (db) {
-                                       db.execute("UPDATE articles SET unread = 1 "+
-                                               "WHERE id = ?", [id]);
-                               }
-
+                               row.addClassName("Unread");
                        }
 
-                       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" +
@@ -912,8 +585,8 @@ function toggleUnread(id, cmode, effect) {
 
                        new Ajax.Request("backend.php", {
                                parameters: query,
-                               onComplete: function(transport) { 
-                                       all_counters_callback2(transport); 
+                               onComplete: function(transport) {
+                                       handle_rpc_json(transport);
                                } });
 
                }
@@ -923,10 +596,10 @@ function toggleUnread(id, cmode, effect) {
        }
 }
 
-function selectionRemoveLabel(id) {
+function selectionRemoveLabel(id, ids) {
        try {
 
-               var ids = getSelectedArticleIds2();
+               if (!ids) var ids = getSelectedArticleIds2();
 
                if (ids.length == 0) {
                        alert(__("No articles are selected."));
@@ -940,15 +613,17 @@ 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));
 
                        new Ajax.Request("backend.php", {
                                parameters: query,
-                               onComplete: function(transport) { 
+                               onComplete: function(transport) {
+                                       handle_rpc_json(transport);
                                        show_labels_in_headlines(transport);
-                                       all_counters_callback2(transport);
                                } });
 
 //             }
@@ -959,10 +634,10 @@ function selectionRemoveLabel(id) {
        }
 }
 
-function selectionAssignLabel(id) {
+function selectionAssignLabel(id, ids) {
        try {
 
-               var ids = getSelectedArticleIds2();
+               if (!ids) ids = getSelectedArticleIds2();
 
                if (ids.length == 0) {
                        alert(__("No articles are selected."));
@@ -978,13 +653,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) { 
+                               onComplete: function(transport) {
+                                       handle_rpc_json(transport);
                                        show_labels_in_headlines(transport);
-                                       all_counters_callback2(transport);
                                } });
 
 //             }
@@ -995,7 +672,7 @@ function selectionAssignLabel(id) {
        }
 }
 
-function selectionToggleUnread(set_state, callback_func, no_error) {
+function selectionToggleUnread(set_state, callback, no_error) {
        try {
                var rows = getSelectedArticleIds2();
 
@@ -1007,44 +684,26 @@ function selectionToggleUnread(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";
-                                       }
-                                       if (db) {
-                                               db.execute("UPDATE articles SET unread = NOT unread WHERE id = ?", 
-                                                       [rows[i]]);
+                                               row.addClassName("Unread");
                                        }
                                }
 
                                if (set_state == false) {
-                                       row.className = nc + "Selected";
-                                       if (db) {
-                                               db.execute("UPDATE articles SET unread = 0 WHERE id = ?", 
-                                                       [rows[i]]);
-                                       }
+                                       row.removeClassName("Unread");
                                }
 
                                if (set_state == true) {
-                                       row.className = nc + "UnreadSelected";
-                                       if (db) {
-                                               db.execute("UPDATE articles SET unread = 1 WHERE id = ?", 
-                                                       [rows[i]]);
-                                       }
+                                       row.addClassName("Unread");
                                }
                        }
                }
 
                if (rows.length > 0) {
 
-                       update_local_feedlist_counters();
-
                        var cmode = "";
 
                        if (set_state == undefined) {
@@ -1056,14 +715,15 @@ function selectionToggleUnread(set_state, callback_func, no_error) {
                        }
 
                        var query = "?op=rpc&subop=catchupSelected" +
-                               "&cmode=" + cmode + "&ids=" + param_escape(rows.toString()); 
+                               "&cmode=" + cmode + "&ids=" + param_escape(rows.toString());
 
                        notify_progress("Loading, please wait...");
 
                        new Ajax.Request("backend.php", {
                                parameters: query,
-                               onComplete: function(transport) { 
-                                       catchup_callback2(transport, callback_func); 
+                               onComplete: function(transport) {
+                                       handle_rpc_json(transport);
+                                       if (callback) callback(transport);
                                } });
 
                }
@@ -1075,9 +735,9 @@ function selectionToggleUnread(set_state, callback_func, no_error) {
 
 function selectionToggleMarked() {
        try {
-       
+
                var rows = getSelectedArticleIds2();
-               
+
                if (rows.length == 0) {
                        alert(__("No articles are selected."));
                        return;
@@ -1087,21 +747,15 @@ function selectionToggleMarked() {
                        toggleMark(rows[i], true, true);
                }
 
-               update_local_feedlist_counters();
-
                if (rows.length > 0) {
 
                        var query = "?op=rpc&subop=markSelected&ids=" +
                                param_escape(rows.toString()) + "&cmode=2";
 
-                       query = query + "&afid=" + getActiveFeedId();
-
-                       query = query + "&omode=lc";
-
                        new Ajax.Request("backend.php", {
                                parameters: query,
-                               onComplete: function(transport) { 
-                                       all_counters_callback2(transport); 
+                               onComplete: function(transport) {
+                                       handle_rpc_json(transport);
                                } });
 
                }
@@ -1113,7 +767,7 @@ function selectionToggleMarked() {
 
 function selectionTogglePublished() {
        try {
-       
+
                var rows = getSelectedArticleIds2();
 
                if (rows.length == 0) {
@@ -1130,14 +784,10 @@ function selectionTogglePublished() {
                        var query = "?op=rpc&subop=publishSelected&ids=" +
                                param_escape(rows.toString()) + "&cmode=2";
 
-                       query = query + "&afid=" + getActiveFeedId();
-
-                       query = query + "&omode=lc";
-
                        new Ajax.Request("backend.php", {
                                parameters: query,
-                               onComplete: function(transport) { 
-                                       all_counters_callback2(transport); 
+                               onComplete: function(transport) {
+                                       handle_rpc_json(transport);
                                } });
 
                }
@@ -1147,91 +797,76 @@ function selectionTogglePublished() {
        }
 }
 
-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);
-               }
-       }
+       $$("#headlines-frame > 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 = $$("#headlines-frame > 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 = $$("#headlines-frame > 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);
        }
 }
 
 function catchupPage() {
 
        var fn = getFeedName(getActiveFeedId(), activeFeedIsCat());
-       
+
        var str = __("Mark all visible articles in %s as read?");
 
        str = str.replace("%s", fn);
@@ -1240,41 +875,35 @@ function catchupPage() {
                return;
        }
 
-       if ($("headlinesList")) {
-               selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', true, 'Unread', true);
-               selectionToggleUnread(false, 'viewCurrentFeed()', true);
-               selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', false);
-       } else {
-               cdmSelectArticles('all');
-               selectionToggleUnread(false, 'viewCurrentFeed()', true)
-               cdmSelectArticles('none');
-       }
+       selectArticles('all');
+       selectionToggleUnread(false, 'viewCurrentFeed()', true)
+       selectArticles('none');
 }
 
 function deleteSelection() {
 
        try {
-       
+
                var rows = getSelectedArticleIds2();
 
                if (rows.length == 0) {
                        alert(__("No articles are selected."));
                        return;
                }
-       
+
                var fn = getFeedName(getActiveFeedId(), activeFeedIsCat());
                var str;
                var op;
-       
+
                if (getActiveFeedId() != 0) {
                        str = __("Delete %d selected articles in %s?");
                } else {
                        str = __("Delete %d selected articles?");
                }
-       
+
                str = str.replace("%d", rows.length);
                str = str.replace("%s", fn);
-       
+
                if (getInitParam("confirm_feed_catchup") == 1 && !confirm(str)) {
                        return;
                }
@@ -1286,6 +915,7 @@ function deleteSelection() {
                new Ajax.Request("backend.php", {
                        parameters: query,
                        onComplete: function(transport) {
+                                       handle_rpc_json(transport);
                                        viewCurrentFeed();
                                } });
 
@@ -1304,11 +934,11 @@ function archiveSelection() {
                        alert(__("No articles are selected."));
                        return;
                }
-       
+
                var fn = getFeedName(getActiveFeedId(), activeFeedIsCat());
                var str;
                var op;
-       
+
                if (getActiveFeedId() != 0) {
                        str = __("Archive %d selected articles in %s?");
                        op = "archive";
@@ -1316,10 +946,10 @@ function archiveSelection() {
                        str = __("Move %d archived articles back?");
                        op = "unarchive";
                }
-       
+
                str = str.replace("%d", rows.length);
                str = str.replace("%s", fn);
-       
+
                if (getInitParam("confirm_feed_catchup") == 1 && !confirm(str)) {
                        return;
                }
@@ -1335,6 +965,7 @@ function archiveSelection() {
                new Ajax.Request("backend.php", {
                        parameters: query,
                        onComplete: function(transport) {
+                                       handle_rpc_json(transport);
                                        viewCurrentFeed();
                                } });
 
@@ -1353,170 +984,83 @@ function catchupSelection() {
                        alert(__("No articles are selected."));
                        return;
                }
-       
+
                var fn = getFeedName(getActiveFeedId(), activeFeedIsCat());
-               
+
                var str = __("Mark %d selected articles in %s as read?");
-       
+
                str = str.replace("%d", rows.length);
                str = str.replace("%s", fn);
-       
+
                if (getInitParam("confirm_feed_catchup") == 1 && !confirm(str)) {
                        return;
                }
-       
-               if ($("headlinesList")) {
-                       selectionToggleUnread(false, 'viewCurrentFeed()', true);
-               } else {
-                       selectionToggleUnread(false, 'viewCurrentFeed()', true)
-               }
+
+               selectionToggleUnread(false, 'viewCurrentFeed()', true)
 
        } catch (e) {
                exception_error("catchupSelection", e);
        }
 }
 
-function editArticleTags(id, feed_id, cdm_enabled) {
-       displayDlg('editArticleTags', id,
-                          function () {
-                                       $("tags_str").focus();
+function editArticleTags(id) {
+               var query = "backend.php?op=dlg&id=editArticleTags&param=" + param_escape(id);
 
-                                       new Ajax.Autocompleter('tags_str', 'tags_choices',
-                                          "backend.php?op=rpc&subop=completeTags",
-                                          { tokens: ',', paramName: "search" });
-                          });
-}
+               if (dijit.byId("editTagsDlg"))
+                       dijit.byId("editTagsDlg").destroyRecursive();
 
-function editTagsSave() {
+               dialog = new dijit.Dialog({
+                       id: "editTagsDlg",
+                       title: __("Edit article Tags"),
+                       style: "width: 600px",
+                       execute: function() {
+                               if (this.validate()) {
+                                       var query = dojo.objectToQuery(this.attr('value'));
 
-       notify_progress("Saving article tags...");
+                                       notify_progress("Saving article tags...", true);
 
-       var form = document.forms["tag_edit_form"];
+                                       new Ajax.Request("backend.php", {
+                                       parameters: query,
+                                       onComplete: function(transport) {
+                                               notify('');
+                                               dialog.hide();
 
-       var query = Form.serialize("tag_edit_form");
+                                               var data = JSON.parse(transport.responseText);
 
-       query = "?op=rpc&subop=setArticleTags&" + query;
+                                               if (data) {
+                                                       var tags_str = data.tags_str;
+                                                       var id = tags_str.id;
 
-       console.log(query);
+                                                       var tags = $("ATSTR-" + id);
+                                                       var tooltip = dijit.byId("ATSTRTIP-" + id);
 
-       new Ajax.Request("backend.php", {
-               parameters: query,
-               onComplete: function(transport) {
-                               try {
-                                       console.log("tags saved...");
-                       
-                                       closeInfoBox();
-                                       notify("");
-                       
-                                       if (tagsAreDisplayed()) {
-                                               _reload_feedlist_after_view = true;
-                                       }                       
-                       
-                                       if (transport.responseXML) {
-                                               var tags_str = transport.responseXML.getElementsByTagName("tags-str")[0];
-                                               
-                                               if (tags_str) {
-                                                       var id = tags_str.getAttribute("id");
-                       
-                                                       if (id) {
-                                                               var tags = $("ATSTR-" + id);
-                                                               if (tags) {
-                                                                       tags.innerHTML = tags_str.firstChild.nodeValue;
-                                                               }
+                                                       if (tags) tags.innerHTML = tags_str.content;
+                                                       if (tooltip) tooltip.attr('label', tags_str.content_full);
 
-                                                               cache_invalidate(id);
-                                                       }
+                                                       cache_invalidate(id);
                                                }
-                                       }
-                       
-                               } catch (e) {
-                                       exception_error("editTagsSave", e);
-                               }
-                       } });
-}
-
-function editTagsInsert() {
-       try {
-
-               var form = document.forms["tag_edit_form"];
-
-               var found_tags = form.found_tags;
-               var tags_str = form.tags_str;
-
-               var tag = found_tags[found_tags.selectedIndex].value;
-
-               if (tags_str.value.length > 0 && 
-                               tags_str.value.lastIndexOf(", ") != tags_str.value.length - 2) {
-
-                       tags_str.value = tags_str.value + ", ";
-               }
-
-               tags_str.value = tags_str.value + tag + ", ";
-
-               found_tags.selectedIndex = 0;
-               
-       } catch (e) {
-               exception_error("editTagsInsert", e);
-       }
-}
-
-function cdmScrollViewport(where) {
-       console.log("cdmScrollViewport: " + where);
-
-       var ctr = $("headlinesInnerContainer");
-
-       if (!ctr) return;
-
-       if (where == "bottom") {
-               ctr.scrollTop = ctr.scrollHeight;
-       } else {
-               ctr.scrollTop = where;
-       }
-}
-
-function cdmArticleIsBelowViewport(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;
-               }
-
-       } catch (e) {
-               exception_error("cdmArticleIsVisible", e);
-       }
-}
 
-function cdmArticleIsAboveViewport(id) {
-       try {
-               var ctr = $("headlinesInnerContainer");
-               var e = $("RROW-" + id);
+                                       }});
+                               }
+                       },
+                       href: query,
+               });
 
-               if (!e || !ctr) return;
+               var tmph = dojo.connect(dialog, 'onLoad', function() {
+               dojo.disconnect(tmph);
 
-               // article starts above viewport
+                       new Ajax.Autocompleter('tags_str', 'tags_choices',
+                          "backend.php?op=rpc&subop=completeTags",
+                          { tokens: ',', paramName: "search" });
+               });
 
-               if (ctr.scrollTop > e.offsetTop + e.offsetHeight) {
-                       return true;
-               } else {        
-                       return false;
-               }
+               dialog.show();
 
-       } catch (e) {
-               exception_error("cdmArticleIsVisible", e);
-       }
 }
 
 function cdmScrollToArticleId(id) {
        try {
-               var ctr = $("headlinesInnerContainer");
+               var ctr = $("headlines-frame");
                var e = $("RROW-" + id);
 
                if (!e || !ctr) return;
@@ -1528,185 +1072,54 @@ function cdmScrollToArticleId(id) {
        }
 }
 
-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() {
+function cache_inject(id, article, param) {
 
        try {
+               if (!cache_check_param(id, param)) {
+                       //console.log("cache_article: miss: " + id + " [p=" + param + "]");
 
-               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) {
-
-//                                     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-", ""));
-
-                               } else if (e.offsetHeight > ctr.offsetHeight &&
-                                               e.offsetTop + e.offsetHeight >= ctr.scrollTop &&
-                                               e.offsetTop + e.offsetHeight <= ctr.scrollTop + ctr.offsetHeight) {
-
-                                       ids.push(e.id.replace("RROW-", "")); 
-
-                               }
-
-                               // method 2: article bottom is visible and is in upper 1/2 of the viewport
-
-/*                             if (e.offsetTop + e.offsetHeight >= ctr.scrollTop &&
-                                               e.offsetTop + e.offsetHeight <= ctr.scrollTop + ctr.offsetHeight/2) {
-
-                                       ids.push(e.id.replace("RROW-", "")); 
-
-                               } */
-
-                       }
-
-                       e = e.nextSibling;
-               }
-
-               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", "");
-                               }
-                       }
-
-                       var query = "?op=rpc&subop=catchupSelected" +
-                               "&cmode=0" + "&ids=" + param_escape(ids.toString());
-
-                       new Ajax.Request("backend.php", {
-                               parameters: query,
-                               onComplete: function(transport) { 
-                                       all_counters_callback2(transport); 
-                               } });
-
-               }
-
-               _cdm_wd_timeout = window.setTimeout("cdmWatchdog()", 4000);
+                  var date = new Date();
+             var ts = Math.round(date.getTime() / 1000);
 
-       } catch (e) {
-               exception_error("cdmWatchdog", e);
-       }
+                       var cache_obj = {};
 
-}
+                       cache_obj["id"] = id;
+                       cache_obj["data"] = article;
+                       cache_obj["param"] = param;
 
+                       if (param) id = id + ":" + param;
 
-function cache_inject(id, article, param) {
-       try {
-               if (!cache_check_param(id, param)) {
-                       console.log("cache_article: miss: " + id + " [p=" + param + "]");
-       
-                       if (db) {
+                       cache_added["TS:" + id] = ts;
 
-                          var date = new Date();
-                     var ts = Math.round(date.getTime() / 1000);
+                       if (has_local_storage())
+                               sessionStorage.setItem(id, JSON.stringify(cache_obj));
+                       else
+                               article_cache.push(cache_obj);
 
-                               db.execute("INSERT INTO cache (id, article, param, added) VALUES (?, ?, ?, ?)",
-                                       [id, article, param, ts]);                              
-                       } else {
-       
-                               var cache_obj = {};
-       
-                               cache_obj["id"] = id;
-                               cache_obj["data"] = article;
-                               cache_obj["param"] = param;
-                               cache_obj["added"] = new Date();
-
-                               if (param) id = id + ":" + param;
-
-                               if (has_local_storage()) 
-                                       localStorage.setItem(id, JSON.stringify(cache_obj));
-                               else
-                                       article_cache.push(cache_obj);
-                       }
-       
                } else {
-                       console.log("cache_article: hit: " + id + " [p=" + param + "]");
+                       //console.log("cache_article: hit: " + id + " [p=" + param + "]");
                }
-       } catch (e) {   
+       } catch (e) {
                exception_error("cache_inject", e);
        }
 }
 
 function cache_find(id) {
 
-       if (db) {
-               var rs = db.execute("SELECT article FROM cache WHERE id = ?", [id]);
-               var a = false;
+       if (has_local_storage()) {
+               var cache_obj = sessionStorage.getItem(id);
 
-               if (rs.isValidRow()) {
-                       var a = rs.field(0);                    
-               }
-
-               rs.close();
+               if (cache_obj) {
+                       cache_obj = JSON.parse(cache_obj);
 
-               return a;
+                       if (cache_obj)
+                               return cache_obj['data'];
+               }
 
        } else {
-
-               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"];
-                               }
+               for (var i = 0; i < article_cache.length; i++) {
+                       if (article_cache[i]["id"] == id) {
+                               return article_cache[i]["data"];
                        }
                }
        }
@@ -1715,66 +1128,38 @@ function cache_find(id) {
 
 function cache_find_param(id, param) {
 
-       if (db) {
-               var rs = db.execute("SELECT article FROM cache WHERE id = ? AND param = ?",
-                       [id, param]);
-               var a = false;
-
-               if (rs.isValidRow()) {
-                       a = rs.field(0);
-               }
-
-               rs.close();
+       if (has_local_storage()) {
 
-               return a;
-
-       } else {
+               if (param) id = id + ":" + param;
 
-               if (has_local_storage()) {
-                       var cache_obj = localStorage.getItem(id + ":" + param);
+               var cache_obj = sessionStorage.getItem(id);
 
-                       if (cache_obj) {
-                               cache_obj = JSON.parse(cache_obj);
+               if (cache_obj) {
+                       cache_obj = JSON.parse(cache_obj);
 
-                               if (cache_obj)
-                                       return cache_obj['data'];
-                       }
+                       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"];
-                               }
+       } 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"];
                        }
                }
        }
+
        return false;
 }
 
 function cache_check(id) {
-
-       if (db) {
-               var rs = db.execute("SELECT COUNT(*) AS c FROM cache WHERE id = ?",
-                       [id]);
-               var a = false;
-
-               if (rs.isValidRow()) {
-                        a = rs.field(0) != "0";
-               }
-
-               rs.close();
-
-               return a;
-
+       if (has_local_storage()) {
+               if (sessionStorage.getItem(id))
+                       return true;
        } else {
-               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;
-                               }
+               for (var i = 0; i < article_cache.length; i++) {
+                       if (article_cache[i]["id"] == id) {
+                               return true;
                        }
                }
        }
@@ -1782,30 +1167,17 @@ function cache_check(id) {
 }
 
 function cache_check_param(id, param) {
+       if (has_local_storage()) {
 
-       if (db) {
-               var rs = db.execute("SELECT COUNT(*) AS c FROM cache WHERE id = ? AND param = ?",
-                       [id, param]);
-               var a = false;
-
-               if (rs.isValidRow()) {
-                       a = rs.field(0) != "0";
-               }
-
-               rs.close();
+               if (param) id = id + ":" + param;
 
-               return a;
+               if (sessionStorage.getItem(id))
+                       return true;
 
        } else {
-
-               if (has_local_storage) {
-                       if (localStorage.getItem(id + ':' + param))
-                                       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;
-                               }
+               for (var i = 0; i < article_cache.length; i++) {
+                       if (article_cache[i]["id"] == id && article_cache[i]["param"] == param) {
+                               return true;
                        }
                }
        }
@@ -1813,63 +1185,69 @@ function cache_check_param(id, param) {
 }
 
 function cache_expire() {
-       if (db) {
+if (has_local_storage()) {
+
                var date = new Date();
-               var ts = Math.round(date.getTime() / 1000);
+               var timestamp = Math.round(date.getTime() / 1000);
 
-               db.execute("DELETE FROM cache WHERE added < ? - 1800 AND id LIKE 'FEEDLIST'", [ts]);
-               db.execute("DELETE FROM cache WHERE added < ? - 600 AND (id LIKE 'F:%' OR id LIKE 'C:%')", [ts]);
-               db.execute("DELETE FROM cache WHERE added < ? - 86400", [ts]);
+               for (var i = 0; i < sessionStorage.length; i++) {
 
+                       var id = sessionStorage.key(i);
 
-       } else {
-               if (has_local_storage()) {
-                       while (localStorage.length > 25) {
-                               localStorage.removeItem(localStorage.key(0));
-                       }
-               } else {
-                       while (article_cache.length > 25) {
-                               article_cache.shift();
+                       if (timestamp - cache_added["TS:" + id] > 180) {
+                               sessionStorage.removeItem(id);
                        }
                }
+
+       } else {
+               while (article_cache.length > 25) {
+                       article_cache.shift();
+               }
        }
 }
 
 function cache_flush() {
-       article_cache = new Array();
+       if (has_local_storage()) {
+               sessionStorage.clear();
+       } else {
+               article_cache = new Array();
+       }
 }
 
 function cache_invalidate(id) {
-       try {   
+       try {
+               if (has_local_storage()) {
 
-               if (db) {
-                       rs = db.execute("DELETE FROM cache WHERE id = ?", [id]);
-                       return rs.rowsAffected != 0;
-               } else {
+                       var found = false;
 
-                       if (has_local_storage()) {
-                               for (var i = 0; i < localStorage.length; i++) {
-                                       var key = localStorage.key(i);
+                       for (var i = 0; i < sessionStorage.length; i++) {
+                               var key = sessionStorage.key(i);
 
-                                       if (key == id || key.indexOf(id + ":") == 0)
-                                               localStorage.removeItem(key);
+//                                     console.warn("cache_invalidate: " + key_id + " cmp " + id);
 
+                               if (key == id || key.indexOf(id + ":") == 0) {
+                                       sessionStorage.removeItem(key);
+                                       found = true;
+                                       break;
                                }
-                       } 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++;
+                       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++;
                        }
                }
 
-               console.log("cache_invalidate: id not found: " + id);
+               //console.log("cache_invalidate: id not found: " + id);
                return false;
        } catch (e) {
                exception_error("cache_invalidate", e);
@@ -1880,45 +1258,62 @@ function getActiveArticleId() {
        return active_post_id;
 }
 
+function preloadBatchedArticles() {
+       try {
+
+               var query = "?op=rpc&subop=getArticles&ids=" +
+                       preload_id_batch.toString();
+
+               new Ajax.Request("backend.php", {
+                       parameters: query,
+                       onComplete: function(transport) {
+
+                               preload_id_batch = [];
+
+                               var articles = JSON.parse(transport.responseText);
+
+                               for (var i = 0; i < articles.length; i++) {
+                                       var id = articles[i]['id'];
+                                       if (!cache_check(id)) {
+                                               cache_inject(id, articles[i]['content']);
+                                               //console.log("preloaded article: " + id);
+                                       }
+                               }
+               } });
+
+       } catch (e) {
+               exception_error("preloadBatchedArticles", e);
+       }
+}
+
 function preloadArticleUnderPointer(id) {
        try {
                if (getInitParam("bw_limit") == "1") return;
 
                if (post_under_pointer == id && !cache_check(id)) {
 
-                       console.log("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]);
+                                       }
                                }
                        }
-                       console.log("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());
+
+                       window.clearTimeout(preload_timeout_id);
+                       preload_batch_timeout_id = window.setTimeout('preloadBatchedArticles()', 1000);
 
-                       new Ajax.Request("backend.php", {
-                               parameters: query,
-                               onComplete: function(transport) { 
-                                       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("preloadArticleUnderPointer", e);
@@ -1947,20 +1342,43 @@ function postMouseOut(id) {
        }
 }
 
-function headlines_scroll_handler() {
+function headlines_scroll_handler(e) {
        try {
+               var hsp = $("headlines-spacer");
+
+               if (!_infscroll_disable) {
+                       if (hsp && (e.scrollTop + e.offsetHeight > hsp.offsetTop) ||
+                                       e.scrollTop + e.offsetHeight > e.scrollHeight - 100) {
+
+                               hsp.innerHTML = "<img src='images/indicator_tiny.gif'> " +
+                                       __("Loading, please wait...");
+
+                               loadMoreHeadlines();
+
+                               //viewNextFeedPage();
+                       }
+               } else {
+                       if (hsp) hsp.innerHTML = "";
+               }
 
-               var e = $("headlinesInnerContainer");
+               if (getInitParam("cdm_auto_catchup") == 1) {
 
-               var toolbar_form = document.forms["main_toolbar_form"];
+                       $$("#headlines-frame > div[id*=RROW][class*=Unread]").each(
+                               function(child) {
+                                       if ($("headlines-frame").scrollTop >
+                                                       (child.offsetTop + child.offsetHeight/2)) {
 
-//             console.log((e.scrollTop + e.offsetHeight) + " vs " + e.scrollHeight + " dis? " +
-//                     _infscroll_disable);
+                                               var id = child.id.replace("RROW-", "");
+
+                                               if (catchup_id_batch.indexOf(id) == -1)
+                                                       catchup_id_batch.push(id);
+                                       }
+                               });
 
-               if (e.scrollTop + e.offsetHeight > e.scrollHeight - 100) {
-                       if (!_infscroll_disable) {
-                               console.log("more cowbell!");
-                               viewNextFeedPage();
+                       if (catchup_id_batch.length > 0 && !_infscroll_request_sent) {
+                               window.clearTimeout(catchup_timeout_id);
+                               catchup_timeout_id = window.setTimeout('catchupBatchedArticles()',
+                                               1000);
                        }
                }
 
@@ -1969,32 +1387,52 @@ function headlines_scroll_handler() {
        }
 }
 
-function catchupRelativeToArticle(below) {
-
+function catchupBatchedArticles() {
        try {
+               if (catchup_id_batch.length > 0 && !_infscroll_request_sent) {
 
+                       var query = "?op=rpc&subop=catchupSelected" +
+                               "&cmode=0&ids=" + param_escape(catchup_id_batch.toString());
 
-               if (!getActiveArticleId()) {
-                       alert(__("No article is selected."));
-                       return;
-               }
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
+                               onComplete: function(transport) {
+                                       handle_rpc_json(transport);
 
-               var visible_ids;
+                                       catchup_id_batch.each(function(id) {
+                                               var elem = $("RROW-" + id);
+                                               if (elem) elem.removeClassName("Unread");
+                                       });
 
-               if ($("headlinesList")) {
-                       visible_ids = getVisibleHeadlineIds();
-               } else {
-                       visible_ids = cdmGetVisibleArticles();
+                                       catchup_id_batch = [];
+                               } });
                }
 
-               var ids_to_mark = new Array();
+       } catch (e) {
+               exception_error("catchupBatchedArticles", e);
+       }
+}
+
+function catchupRelativeToArticle(below) {
+
+       try {
+
+
+               if (!getActiveArticleId()) {
+                       alert(__("No article is selected."));
+                       return;
+               }
+
+               var visible_ids = getVisibleArticleIds();
+
+               var ids_to_mark = new Array();
 
                if (!below) {
                        for (var i = 0; i < visible_ids.length; i++) {
                                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 {
@@ -2006,7 +1444,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 {
@@ -2024,16 +1462,16 @@ function catchupRelativeToArticle(below) {
 
                                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" +
-                                       "&cmode=0" + "&ids=" + param_escape(ids_to_mark.toString()); 
+                                       "&cmode=0" + "&ids=" + param_escape(ids_to_mark.toString());
 
                                new Ajax.Request("backend.php", {
                                        parameters: query,
-                                       onComplete: function(transport) { 
-                                               catchup_callback2(transport); 
+                                       onComplete: function(transport) {
+                                               handle_rpc_json(transport);
                                        } });
 
                        }
@@ -2047,16 +1485,26 @@ function catchupRelativeToArticle(below) {
 function cdmExpandArticle(id) {
        try {
 
+               hideAuxDlg();
+
                var elem = $("CICD-" + active_post_id);
 
+               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";
+               }
+
                if (id == active_post_id && Element.visible(elem))
                        return true;
 
-               cdmSelectArticles("none");
+               selectArticles("none");
 
                var old_offset = $("RROW-" + id).offsetTop;
 
-               if (active_post_id && elem) {
+               if (active_post_id && elem && !getInitParam("cdm_expanded")) {
                        Element.hide(elem);
                        Element.show("CEXC-" + active_post_id);
                }
@@ -2068,14 +1516,49 @@ function cdmExpandArticle(id) {
                if (!Element.visible(elem)) {
                        Element.show(elem);
                        Element.hide("CEXC-" + id);
+
+                       if ($("CWRAP-" + id).innerHTML == "") {
+
+                               $("FUPDPIC-" + id).src = "images/indicator_tiny.gif";
+
+                               $("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';
+
+                                               handle_rpc_json(transport);
+
+                                               var reply = JSON.parse(transport.responseText);
+
+                                               if (reply) {
+                                                       var article = reply['article']['content'];
+                                                       var recv_id = reply['article']['id'];
+
+                                                       if (recv_id == id)
+                                                               $("CWRAP-" + id).innerHTML = article;
+
+                                               } else {
+                                                       $("CWRAP-" + id).innerHTML = __("Unable to load article.");
+
+                                               }
+                               }});
+
+                       }
                }
 
                var new_offset = $("RROW-" + id).offsetTop;
 
-               $("headlinesInnerContainer").scrollTop += (new_offset-old_offset);
+               $("headlines-frame").scrollTop += (new_offset-old_offset);
 
-               if ($("RROW-" + id).offsetTop != old_offset) 
-                       $("headlinesInnerContainer").scrollTop = new_offset;
+               if ($("RROW-" + id).offsetTop != old_offset)
+                       $("headlines-frame").scrollTop = new_offset;
 
                toggleUnread(id, 0, true);
                toggleSelected(id);
@@ -2094,9 +1577,11 @@ function fixHeadlinesOrder(ids) {
 
                        if (e) {
                                if (i % 2 == 0) {
-                                       e.className = e.className.replace("even", "odd");
+                                       e.removeClassName("even");
+                                       e.addClassName("odd");
                                } else {
-                                       e.className = e.className.replace("odd", "even");
+                                       e.removeClassName("odd");
+                                       e.addClassName("even");
                                }
                        }
                }
@@ -2105,96 +1590,73 @@ function fixHeadlinesOrder(ids) {
        }
 }
 
-function hideReadHeadlines() {
+function getArticleUnderPointer() {
+       return post_under_pointer;
+}
+
+function zoomToArticle(event, id) {
        try {
+               var cached_article = cache_find(id);
 
-               var ids = false;
-               var vis_ids = new Array();
+               if (dijit.byId("ATAB-" + id))
+                       if (!event || !event.shiftKey)
+                               return dijit.byId("content-tabs").selectChild(dijit.byId("ATAB-" + id));
 
-               if ($("headlinesList")) {
-                       ids = getVisibleHeadlineIds();
-               } else {
-                       ids = cdmGetVisibleArticles();
-               }
+               if (dijit.byId("ATSTRTIP-" + id))
+                       dijit.byId("ATSTRTIP-" + id).destroyRecursive();
 
-               var read_headlines_visible = true;
+               if (cached_article) {
+                       //closeArticlePanel();
 
-               for (var i = 0; i < ids.length; i++) {
-                       var row = $("RROW-" + ids[i]);
+                       var article_pane = new dijit.layout.ContentPane({
+                               title: __("Loading...") , content: cached_article,
+                               style: 'padding : 0px;',
+                               id: 'ATAB-' + id,
+                               closable: true });
 
-                       if (row && row.className) {
-                               if (read_headlines_visible) {
-                                       if (row.className.match("Unread") || row.className.match("Selected")) {
-                                               Element.show(row);
-                                               vis_ids.push(ids[i]);
-                                       } else {
-                                               //Effect.Fade(row, {duration : 0.3});
-                                               Element.hide(row);
-                                       }
-                               } else {
-                                       Element.show(row);
-                                       vis_ids.push(ids[i]);
-                               }
-                       }
-               }
-               
-               fixHeadlinesOrder(vis_ids);
+                       dijit.byId("content-tabs").addChild(article_pane);
 
-               read_headlines_visible = !read_headlines_visible;
+                       if (!event || !event.shiftKey)
+                               dijit.byId("content-tabs").selectChild(article_pane);
 
-       } catch (e) {
-               exception_error("hideReadHeadlines", e);
-       } 
-}
+                       if ($("PTITLE-" + id))
+                               article_pane.attr('title', $("PTITLE-" + id).innerHTML);
 
-function invertHeadlineSelection() {
-       try {
-               var rows = new Array();
-               var r = false;
-               
-               if (!isCdmMode()) {             
-                       r = document.getElementsByTagName("TR");
                } else {
-                       r = document.getElementsByTagName("DIV");
-               }
 
-               for (var i = 0; i < r.length; i++) {
-                       if (r[i].id && r[i].id.match("RROW-")) {
-                               rows.push(r[i]);
-                       }
-               }
-               
-               for (var i = 0; i < rows.length; i++) {
-                       var nc = rows[i].className;
-                       var id = rows[i].id.replace("RROW-", "");
-                       var cb = $("RCHK-" + id);
+                       var query = "?op=rpc&subop=getArticles&ids=" + param_escape(id);
 
-                       if (!rows[i].className.match("Selected")) {
-                               nc = nc + "Selected";
-                               cb.checked = true;
-                       } else {
-                               nc = nc.replace("Selected", "");
-                               cb.checked = false;
-                       }
+                       notify_progress("Loading, please wait...", true);
 
-                       rows[i].className = nc;
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
+                               onComplete: function(transport) {
+                                       notify('');
 
-               }
+                                       var reply = JSON.parse(transport.responseText);
 
-       } catch (e) {
-               exception_error("invertHeadlineSelection", e);
-       }
-}
+                                       if (reply) {
+                                               //closeArticlePanel();
 
-function getArticleUnderPointer() {
-       return post_under_pointer;
-}
+                                               var content = reply[0]['content'];
 
-function zoomToArticle(id) {
-       try {
-               var w = window.open("backend.php?op=view&mode=zoom&id=" + param_escape(id), 
-                       "ttrss_zoom_" + id,
-                       "status=0,toolbar=0,location=0,width=450,height=300,scrollbars=1,menubar=0");
+                                               var article_pane = new dijit.layout.ContentPane({
+                                                       title: "article-" + id , content: content,
+                                                       style: 'padding : 0px;',
+                                                       id: 'ATAB-' + id,
+                                                       closable: true });
+
+                                               dijit.byId("content-tabs").addChild(article_pane);
+
+                                               if (!event || !event.shiftKey)
+                                                       dijit.byId("content-tabs").selectChild(article_pane);
+
+                                               if ($("PTITLE-" + id))
+                                                       article_pane.attr('title', $("PTITLE-" + id).innerHTML);
+                                       }
+
+                               } });
+                       }
 
        } catch (e) {
                exception_error("zoomToArticle", e);
@@ -2209,7 +1671,7 @@ function scrollArticle(offset) {
                                ci.scrollTop += offset;
                        }
                } else {
-                       var hi = $("headlinesInnerContainer");
+                       var hi = $("headlines-frame");
                        if (hi) {
                                hi.scrollTop += offset;
                        }
@@ -2222,29 +1684,17 @@ function scrollArticle(offset) {
 
 function show_labels_in_headlines(transport) {
        try {
-               if (transport.responseXML) {
-                       var info = transport.responseXML.getElementsByTagName("info-for-headlines")[0];
-
-                       var elems = info.getElementsByTagName("entry");
-
-                       for (var l = 0; l < elems.length; l++) {
-                               var e_id = elems[l].getAttribute("id");
-
-                               if (e_id) {
-
-                                       var ctr = $("HLLCTR-" + e_id);
-
-                                       if (ctr) {
-                                               ctr.innerHTML = elems[l].firstChild.nodeValue;
-                                       }
-                               }
+               var data = JSON.parse(transport.responseText);
 
-                       }
+               if (data) {
+                       data['info-for-headlines'].each(function(elem) {
+                               var ctr = $("HLLCTR-" + elem.id);
 
+                               if (ctr) ctr.innerHTML = elem.labels;
+                       });
                }
        } catch (e) {
                exception_error("show_labels_in_headlines", e);
-
        }
 }
 
@@ -2268,7 +1718,7 @@ function toggleHeadlineActions() {
        }
 }
 
-function publishWithNote(id, def_note) {
+/* function publishWithNote(id, def_note) {
        try {
                if (!def_note) def_note = '';
 
@@ -2281,7 +1731,7 @@ function publishWithNote(id, def_note) {
        } catch (e) {
                exception_error("publishWithNote", e);
        }
-}
+} */
 
 function emailArticle(id) {
        try {
@@ -2296,73 +1746,582 @@ function emailArticle(id) {
                        id = ids.toString();
                }
 
-               displayDlg('emailArticle', id, 
-                  function () {                                
+               if (dijit.byId("emailArticleDlg"))
+                       dijit.byId("emailArticleDlg").destroyRecursive();
+
+               var query = "backend.php?op=dlg&id=emailArticle&param=" + param_escape(id);
+
+               dialog = new dijit.Dialog({
+                       id: "emailArticleDlg",
+                       title: __("Forward article by email"),
+                       style: "width: 600px",
+                       execute: function() {
+                               if (this.validate()) {
+
+                                       new Ajax.Request("backend.php", {
+                                               parameters: dojo.objectToQuery(this.attr('value')),
+                                               onComplete: function(transport) {
+
+                                                       var reply = JSON.parse(transport.responseText);
+
+                                                       var error = reply['error'];
+
+                                                       if (error) {
+                                                               alert(__('Error sending email:') + ' ' + error);
+                                                       } else {
+                                                               notify_info('Your message has been sent.');
+                                                               dialog.hide();
+                                                       }
+
+                                       } });
+                               }
+                       },
+                       href: query});
+
+               var tmph = dojo.connect(dialog, 'onLoad', function() {
+               dojo.disconnect(tmph);
+
+                  new Ajax.Autocompleter('emailArticleDlg_destination', 'emailArticleDlg_dst_choices',
+                          "backend.php?op=rpc&subop=completeEmails",
+                          { tokens: '', paramName: "search" });
+               });
+
+               dialog.show();
+
+               /* 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() {
+function dismissArticle(id) {
        try {
-               var f = document.forms['article_email_form'];
+               var elem = $("RROW-" + id);
 
-               if (f.destination.value == "") {
-                       alert("Please fill in the destination email.");
-                       return;
+               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 (f.subject.value == "") {
-                       alert("Please fill in the subject.");
-                       return;
+               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]);
+                       }
                }
 
-               var query = Form.serialize("article_email_form");
+               fixHeadlinesOrder(tmp);
 
-//             console.log(query);
+       } catch (e) {
+               exception_error("dismissSelectedArticles", e);
+       }
+}
 
-               new Ajax.Request("backend.php", {
-                       parameters: query,
-                       onComplete: function(transport) { 
-                               try {
+function getVisibleArticleIds() {
+       var ids = [];
 
-                                       var error = transport.responseXML.getElementsByTagName('error')[0];
+       try {
 
-                                       if (error) {
-                                               alert(__('Error sending email:') + ' ' + error.firstChild.nodeValue);
-                                       } else {
-                                               notify_info('Your message has been sent.');
-                                               closeInfoBox();
-                                       }
+               getLoadedArticleIds().each(function(id) {
+                       var elem = $("RROW-" + id);
+                       if (elem && Element.visible(elem))
+                               ids.push(id);
+                       });
+
+       } catch (e) {
+               exception_error("getVisibleArticleIds", e);
+       }
+
+       return ids;
+}
 
-                               } catch (e) {
-                                       exception_error("sendEmailDo", e);
+function cdmClicked(event, id) {
+       try {
+               var shift_key = event.shiftKey;
+
+               hideAuxDlg();
+
+               if (!event.ctrlKey) {
+
+                       if (!getInitParam("cdm_expanded")) {
+                               return cdmExpandArticle(id);
+                       } else {
+
+                               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_json(transport);
+                                       } });
+
+                               return true;
+                       }
+
+               } else {
+                       toggleSelected(id, true);
+                       toggleUnread(id, 0, false);
+                       zoomToArticle(event, id);
+               }
+
+       } catch (e) {
+               exception_error("cdmClicked");
+       }
+
+       return false;
+}
+
+function postClicked(event, id) {
+       try {
+
+               if (!event.ctrlKey) {
+                       return true;
+               } else {
+                       postOpenInNewTab(event, id);
+                       return false;
+               }
+
+       } catch (e) {
+               exception_error("postClicked");
+       }
+}
+
+function hlOpenInNewTab(event, id) {
+       toggleUnread(id, 0, false);
+       zoomToArticle(event, id);
+}
+
+function postOpenInNewTab(event, id) {
+       closeArticlePanel(id);
+       zoomToArticle(event, id);
+}
+
+function hlClicked(event, id) {
+       try {
+               if (event.which == 2) {
+                       view(id);
+                       return true;
+               } else if (event.altKey) {
+                       openArticleInNewWindow(id);
+               } else if (!event.ctrlKey) {
+                       view(id);
+                       return false;
+               } else {
+                       toggleSelected(id);
+                       toggleUnread(id, 0, false);
+                       zoomToArticle(event, id);
+                       return false;
+               }
+
+       } catch (e) {
+               exception_error("hlClicked");
+       }
+}
+
+function getFirstVisibleHeadlineId() {
+       var rows = getVisibleArticleIds();
+       return rows[0];
+
+}
+
+function getLastVisibleHeadlineId() {
+       var rows = getVisibleArticleIds();
+       return rows[rows.length-1];
+}
+
+function openArticleInNewWindow(id) {
+       toggleUnread(id, 0, false);
+       window.open("backend.php?op=la&id=" + id);
+}
+
+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 = $("headlines-frame");
+               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);
+       }
+
+}
+
+function headlineActionsChange(elem) {
+       try {
+               eval(elem.value);
+               elem.attr('value', 'false');
+       } catch (e) {
+               exception_error("headlineActionsChange", e);
+       }
+}
+
+function closeArticlePanel() {
+
+       var tabs = dijit.byId("content-tabs");
+       var child = tabs.selectedChildWidget;
+
+       if (child && tabs.getIndexOfChild(child) > 0) {
+               tabs.removeChild(child);
+               child.destroy();
+       } else {
+               if (dijit.byId("content-insert"))
+                       dijit.byId("headlines-wrap-inner").removeChild(
+                               dijit.byId("content-insert"));
+       }
+}
+
+function initHeadlinesMenu() {
+       try {
+               if (dijit.byId("headlinesMenu"))
+                       dijit.byId("headlinesMenu").destroyRecursive();
+
+               var ids = [];
+
+               if (!isCdmMode()) {
+                       nodes = $$("#headlines-frame > div[id*=RROW]");
+               } else {
+                       nodes = $$("#headlines-frame span[id*=RTITLE]");
+               }
+
+               nodes.each(function(node) {
+                       ids.push(node.id);
+               });
+
+               var menu = new dijit.Menu({
+                       id: "headlinesMenu",
+                       targetNodeIds: ids,
+               });
+
+               var tmph = dojo.connect(menu, '_openMyself', function (event) {
+                       var callerNode = event.target, match = null, tries = 0;
+
+                       while (match == null && callerNode && tries <= 3) {
+                               match = callerNode.id.match("^[A-Z]+[-]([0-9]+)$");
+                               callerNode = callerNode.parentNode;
+                               ++tries;
+                       }
+
+                       if (match) this.callerRowId = parseInt(match[1]);
+
+               });
+
+/*             if (!isCdmMode())
+                       menu.addChild(new dijit.MenuItem({
+                               label: __("View article"),
+                               onClick: function(event) {
+                                       view(this.getParent().callerRowId);
+                               }})); */
+
+               menu.addChild(new dijit.MenuItem({
+                       label: __("Open original article"),
+                       onClick: function(event) {
+                               openArticleInNewWindow(this.getParent().callerRowId);
+                       }}));
+
+               menu.addChild(new dijit.MenuItem({
+                       label: __("View in a tt-rss tab"),
+                       onClick: function(event) {
+                               hlOpenInNewTab(event, this.getParent().callerRowId);
+                               }}));
+
+//             menu.addChild(new dijit.MenuSeparator());
+
+               var labels = dijit.byId("feedTree").model.getItemsInCategory(-2);
+
+               if (labels) {
+
+                       menu.addChild(new dijit.MenuSeparator());
+
+                       var labelAddMenu = new dijit.Menu({ownerMenu: menu});
+                       var labelDelMenu = new dijit.Menu({ownerMenu: menu});
+
+                       labels.each(function(label) {
+                               var id = label.id[0];
+                               var bare_id = id.substr(id.indexOf(":")+1);
+                               var name = label.name[0];
+
+                               bare_id = -11-bare_id;
+
+                               labelAddMenu.addChild(new dijit.MenuItem({
+                                       label: name,
+                                       labelId: bare_id,
+                                       onClick: function(event) {
+                                               selectionAssignLabel(this.labelId,
+                                                       [this.getParent().ownerMenu.callerRowId]);
+                               }}));
+
+                               labelDelMenu.addChild(new dijit.MenuItem({
+                                       label: name,
+                                       labelId: bare_id,
+                                       onClick: function(event) {
+                                               selectionRemoveLabel(this.labelId,
+                                                       [this.getParent().ownerMenu.callerRowId]);
+                               }}));
+
+                       });
+
+                       menu.addChild(new dijit.PopupMenuItem({
+                               label: __("Assign label"),
+                               popup: labelAddMenu,
+                       }));
+
+                       menu.addChild(new dijit.PopupMenuItem({
+                               label: __("Remove label"),
+                               popup: labelDelMenu,
+                       }));
+
+               }
+
+               menu.startup();
+
+       } catch (e) {
+               exception_error("initHeadlinesMenu", e);
+       }
+}
+
+function tweetArticle(id) {
+       try {
+               var query = "?op=rpc&subop=getTweetInfo&id=" + param_escape(id);
+
+               console.log(query);
+
+               var d = new Date();
+      var ts = d.getTime();
+
+               var w = window.open('backend.php?op=loading', 'ttrss_tweet',
+                       "status=0,toolbar=0,location=0,width=500,height=400,scrollbars=1,menubar=0");
+
+               new Ajax.Request("backend.php", {
+                       parameters: query,
+                       onComplete: function(transport) {
+                               var ti = JSON.parse(transport.responseText);
+
+                               var share_url = "http://twitter.com/share?_=" + ts +
+                                       "&text=" + param_escape(ti.title) +
+                                       "&url=" + param_escape(ti.link);
+
+                               w.location.href = share_url;
+
                        } });
 
+
        } catch (e) {
-               exception_error("emailArticleDo", e);
+               exception_error("tweetArticle", e);
        }
 }
 
-function cdmDismissArticle(id) {
+function editArticleNote(id) {
        try {
-               var elem = $("RROW-" + id);
 
-               toggleUnread(id, 0, true);
+               var query = "backend.php?op=dlg&id=editArticleNote&param=" + param_escape(id);
 
-               new Effect.Fade(elem, {duration : 0.5});
+               if (dijit.byId("editNoteDlg"))
+                       dijit.byId("editNoteDlg").destroyRecursive();
+
+               dialog = new dijit.Dialog({
+                       id: "editNoteDlg",
+                       title: __("Edit article note"),
+                       style: "width: 600px",
+                       execute: function() {
+                               if (this.validate()) {
+                                       var query = dojo.objectToQuery(this.attr('value'));
+
+                                       notify_progress("Saving article note...", true);
+
+                                       new Ajax.Request("backend.php", {
+                                       parameters: query,
+                                       onComplete: function(transport) {
+                                               notify('');
+                                               dialog.hide();
+
+                                               var reply = JSON.parse(transport.responseText);
+
+                                               cache_invalidate(id);
+
+                                               var elem = $("POSTNOTE-" + id);
+
+                                               if (elem) {
+                                                       Element.hide(elem);
+                                                       elem.innerHTML = reply.note;
+
+                                                       if (reply.raw_length != 0)
+                                                               new Effect.Appear(elem);
+                                               }
+
+                                       }});
+                               }
+                       },
+                       href: query,
+               });
+
+               dialog.show();
 
        } catch (e) {
-               exception_error("cdmDismissArticle", e);
+               exception_error("editArticleNote", e);
        }
 }
+
+function player(elem) {
+       var aid = elem.getAttribute("audio-id");
+       var status = elem.getAttribute("status");
+
+       var audio = $(aid);
+
+       if (audio) {
+               if (status == 0) {
+                       audio.play();
+                       status = 1;
+                       elem.innerHTML = __("Playing...");
+                       elem.title = __("Click to pause");
+                       elem.addClassName("playing");
+               } else {
+                       audio.pause();
+                       status = 0;
+                       elem.innerHTML = __("Play");
+                       elem.title = __("Click to play");
+                       elem.removeClassName("playing");
+               }
+
+               elem.setAttribute("status", status);
+       } else {
+               alert("Your browser doesn't seem to support HTML5 audio.");
+       }
+}
+