]> git.wh0rd.org - tt-rss.git/blobdiff - js/viewfeed.js
implement support for multiple pub/mark buttons, add plugin which adds a separate...
[tt-rss.git] / js / viewfeed.js
index b8dc05aed36cf37b9cbb8659bd8ba8e4d6ba07c9..da5ded64facd9b52a5784fdb183cb4115bdb0d66 100644 (file)
@@ -1,7 +1,7 @@
-var active_post_id = false;
-
 var article_cache = new Array();
 
+var _active_article_id = 0;
+
 var vgroup_last_feed = false;
 var post_under_pointer = false;
 
@@ -9,11 +9,10 @@ var last_requested_article = false;
 
 var catchup_id_batch = [];
 var catchup_timeout_id = false;
-var feed_precache_timeout_id = false;
-var precache_idle_timeout_id = false;
 
 var cids_requested = [];
 var loaded_article_ids = [];
+var _last_headlines_update = 0;
 
 var has_storage = 'sessionStorage' in window && window['sessionStorage'] !== null;
 
@@ -47,19 +46,18 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
                                if (getInitParam("cdm_auto_catchup") == 1) {
                                        content = content + "<div id='headlines-spacer'></div>";
                                }
-
-                               cache_headlines(feed_id, is_cat, reply['headlines']['toolbar'], content);
                                return;
                        }
 
-                       setActiveFeedId(feed_id, is_cat);
+                       if (feed_id != getActiveFeedId() || is_cat != activeFeedIsCat())
+                               return;
 
-                       dijit.getEnclosingWidget(
+                       /* dijit.getEnclosingWidget(
                                document.forms["main_toolbar_form"].update).attr('disabled',
-                                       is_cat || feed_id <= 0);
+                                       is_cat || feed_id <= 0); */
 
                        try {
-                               if (offset == 0 && infscroll_req == false) {
+                               if (infscroll_req == false) {
                                        $("headlines-frame").scrollTop = 0;
                                }
                        } catch (e) { };
@@ -68,7 +66,7 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
 
                        vgroup_last_feed = reply['headlines-info']['vgroup_last_feed'];
 
-                       if (parseInt(headlines_count) < getInitParam("default_article_limit")) {
+                       if (parseInt(headlines_count) < 30) {
                                _infscroll_disable = 1;
                        } else {
                                _infscroll_disable = 0;
@@ -78,7 +76,7 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
                        var articles = reply['articles'];
                        //var runtime_info = reply['runtime-info'];
 
-                       if (offset == 0 && infscroll_req == false) {
+                       if (infscroll_req == false) {
                                loaded_article_ids = [];
 
                                dijit.byId("headlines-frame").attr('content',
@@ -162,16 +160,10 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
                                        initHeadlinesMenu();
 
                                        new_elems.each(function(child) {
-                                               var cb = dijit.byId(child.id.replace("RROW-", "RCHK-"));
+                                               dojo.parser.parse(child);
 
-                                               if (!cb) {
-                                                       dojo.parser.parse(child);
-
-                                                       if (!Element.visible(child))
-                                                               new Effect.Appear(child, { duration : 0.5 });
-                                               } else {
-                                                       c.domNode.removeChild(child);
-                                               }
+                                               if (!Element.visible(child))
+                                                       new Effect.Appear(child, { duration : 0.5 });
                                        });
 
                                } else {
@@ -183,9 +175,6 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
                                }
                        }
 
-                       if (headlines_count > 0)
-                               cache_headlines(feed_id, is_cat, reply['headlines']['toolbar'], $("headlines-frame").innerHTML);
-
                        if (articles) {
                                for (var i = 0; i < articles.length; i++) {
                                        var a_id = articles[i]['id'];
@@ -195,10 +184,6 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
                                console.log("no cached articles received");
                        }
 
-                       // do not precache stuff after fresh feed
-                       if (feed_id != -3)
-                               precache_headlines();
-
                        if (counters)
                                parse_counters(counters);
                        else
@@ -215,6 +200,19 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
                }
 
                _infscroll_request_sent = 0;
+               _last_headlines_update = new Date().getTime();
+
+               unpackVisibleHeadlines();
+
+               // if we have some more space in the buffer, why not try to fill it
+
+               if (!_infscroll_disable && $("headlines-spacer") &&
+                               $("headlines-spacer").offsetTop < $("headlines-frame").offsetHeight) {
+
+                       window.setTimeout(function() {
+                               loadMoreHeadlines();
+                       }, 250);
+               }
 
                notify("");
 
@@ -247,10 +245,9 @@ function render_article(article) {
        }
 }
 
-function showArticleInHeadlines(id) {
+function showArticleInHeadlines(id, noexpand) {
 
        try {
-
                selectArticles("none");
 
                var crow = $("RROW-" + id);
@@ -259,7 +256,9 @@ function showArticleInHeadlines(id) {
 
                var article_is_unread = crow.hasClassName("Unread");
 
-               crow.removeClassName("Unread");
+               if (!noexpand)
+                       crow.removeClassName("Unread");
+               crow.addClassName("active");
 
                selectArticles('none');
 
@@ -272,13 +271,9 @@ function showArticleInHeadlines(id) {
                        //
                }
 
-               if (article_is_unread && view_mode == "all_articles") {
-                       cache_headlines(getActiveFeedId(), activeFeedIsCat(), null, $("headlines-frame").innerHTML);
-               }
-
                markHeadline(id);
 
-               if (article_is_unread)
+               if (article_is_unread && !noexpand)
                        _force_scheduled_update = true;
 
        } catch (e) {
@@ -303,7 +298,7 @@ function article_callback2(transport, id) {
                if (reply) {
 
                        reply.each(function(article) {
-                               if (active_post_id == article['id']) {
+                               if (getActiveArticleId() == article['id']) {
                                        render_article(article['content']);
                                }
                                cids_requested.remove(article['id']);
@@ -328,7 +323,7 @@ function article_callback2(transport, id) {
                var unread_in_buffer = $$("#headlines-frame > div[id*=RROW][class*=Unread]").length
                request_counters(unread_in_buffer == 0);
 
-               headlines_scroll_handler($("headlines-frame"));
+               //headlines_scroll_handler($("headlines-frame"));
 
 /*             try {
                        if (!_infscroll_disable &&
@@ -346,11 +341,19 @@ function article_callback2(transport, id) {
        }
 }
 
-function view(id) {
+function view(id, activefeed, noexpand) {
        try {
+               var oldrow = $("RROW-" + getActiveArticleId());
+               if (oldrow) oldrow.removeClassName("active");
+
                var crow = $("RROW-" + id);
 
                if (!crow) return;
+               if (noexpand) {
+                       setActiveArticleId(id);
+                       showArticleInHeadlines(id, noexpand);
+                       return;
+               }
 
                console.log("loading article: " + id);
 
@@ -358,8 +361,6 @@ function view(id) {
 
                console.log("cache check result: " + (cached_article != false));
 
-               hideAuxDlg();
-
                var query = "?op=article&method=view&id=" + param_escape(id);
 
                var neighbor_ids = getRelativePostIds(id);
@@ -382,11 +383,9 @@ function view(id) {
 
                var article_is_unread = crow.hasClassName("Unread");
 
-               active_post_id = id;
+               setActiveArticleId(id);
                showArticleInHeadlines(id);
 
-               precache_headlines();
-
                if (cached_article && article_is_unread) {
 
                        query = query + "&mode=prefetch";
@@ -412,7 +411,7 @@ function view(id) {
                                        console.warn(e);
                                } */
 
-                               headlines_scroll_handler($("headlines-frame"));
+                               //headlines_scroll_handler($("headlines-frame"));
 
                                return;
                        }
@@ -443,22 +442,26 @@ function toggleMark(id, client_only) {
        try {
                var query = "?op=rpc&id=" + id + "&method=mark";
 
-               var img = $("FMPIC-" + id);
+               var row = $("RROW-" + id);
+               if (!row) return;
 
-               if (!img) return;
+               var imgs = row.getElementsByClassName("markedPic");
 
-               if (img.src.match("mark_unset")) {
-                       img.src = img.src.replace("mark_unset", "mark_set");
-                       img.alt = __("Unstar article");
-                       query = query + "&mark=1";
+               for (i = 0; i < imgs.length; i++) {
+                       var img = imgs[i];
 
-               } else {
-                       img.src = img.src.replace("mark_set", "mark_unset");
-                       img.alt = __("Star article");
-                       query = query + "&mark=0";
+                       if (!row.hasClassName("marked")) {
+                               img.src = img.src.replace("mark_unset", "mark_set");
+                               img.alt = __("Unstar article");
+                               query = query + "&mark=1";
+                       } else {
+                               img.src = img.src.replace("mark_set", "mark_unset");
+                               img.alt = __("Star article");
+                               query = query + "&mark=0";
+                       }
                }
 
-               cache_headlines(getActiveFeedId(), activeFeedIsCat(), null, $("headlines-frame").innerHTML);
+               row.toggleClassName("marked");
 
                if (!client_only) {
                        new Ajax.Request("backend.php", {
@@ -483,23 +486,29 @@ function togglePub(id, client_only, no_effects, note) {
                        query = query + "&note=undefined";
                }
 
-               var img = $("FPPIC-" + id);
-
-               if (!img) return;
+               var row = $("RROW-" + id);
+               if (!row) 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";
+               var imgs = row.getElementsByClassName("pubPic");
 
-               } else {
-                       img.src = img.src.replace("pub_set", "pub_unset");
-                       img.alt = __("Publish article");
+               for (i = 0; i < imgs.length; i++) {
+                       var img = imgs[i];
 
-                       query = query + "&pub=0";
+                       if (!row.hasClassName("published") || note != undefined) {
+                               img.src = img.src.replace("pub_unset", "pub_set");
+                               img.alt = __("Unpublish article");
+                               query = query + "&pub=1";
+                       } else {
+                               img.src = img.src.replace("pub_set", "pub_unset");
+                               img.alt = __("Publish article");
+                               query = query + "&pub=0";
+                       }
                }
 
-               cache_headlines(getActiveFeedId(), activeFeedIsCat(), null, $("headlines-frame").innerHTML);
+               if (note != undefined)
+                       row.addClassName("published");
+               else
+                       row.toggleClassName("published");
 
                if (!client_only) {
                        new Ajax.Request("backend.php", {
@@ -514,7 +523,7 @@ function togglePub(id, client_only, no_effects, note) {
        }
 }
 
-function moveToPost(mode, noscroll) {
+function moveToPost(mode, noscroll, noexpand) {
 
        try {
 
@@ -523,22 +532,22 @@ function moveToPost(mode, noscroll) {
                var prev_id = false;
                var next_id = false;
 
-               if (!$('RROW-' + active_post_id)) {
-                       active_post_id = false;
+               if (!$('RROW-' + getActiveArticleId())) {
+                       setActiveArticleId(0);
                }
 
-               if (active_post_id == false) {
+               if (!getActiveArticleId()) {
                        next_id = rows[0];
                        prev_id = rows[rows.length-1]
                } else {
                        for (var i = 0; i < rows.length; i++) {
-                               if (rows[i] == active_post_id) {
+                               if (rows[i] == getActiveArticleId()) {
 
                                        // Account for adjacent identical article ids.
                                        if (i > 0) prev_id = rows[i-1];
 
                                        for (var j = i+1; j < rows.length; j++) {
-                                               if (rows[j] != active_post_id) {
+                                               if (rows[j] != getActiveArticleId()) {
                                                        next_id = rows[j];
                                                        break;
                                                }
@@ -549,50 +558,62 @@ function moveToPost(mode, noscroll) {
                }
 
                if (mode == "next") {
-                       if (next_id || active_post_id) {
+                       if (next_id || getActiveArticleId()) {
                                if (isCdmMode()) {
 
-                                       var article = $("RROW-" + active_post_id);
+                                       var article = $("RROW-" + getActiveArticleId());
                                        var ctr = $("headlines-frame");
 
                                        if (!noscroll && article && article.offsetTop + article.offsetHeight >
                                                        ctr.scrollTop + ctr.offsetHeight) {
 
-                                               scrollArticle(ctr.offsetHeight/2);
+                                               scrollArticle(ctr.offsetHeight/4);
 
                                        } else if (next_id) {
-                                               cdmExpandArticle(next_id);
-                                               cdmScrollToArticleId(next_id);
+                                               cdmExpandArticle(next_id, noexpand);
+                                               cdmScrollToArticleId(next_id, true);
                                        }
 
                                } else if (next_id) {
                                        correctHeadlinesOffset(next_id);
-                                       view(next_id, getActiveFeedId());
+                                       view(next_id, getActiveFeedId(), noexpand);
                                }
                        }
                }
 
                if (mode == "prev") {
-                       if (prev_id || active_post_id) {
+                       if (prev_id || getActiveArticleId()) {
                                if (isCdmMode()) {
 
-                                       var article = $("RROW-" + active_post_id);
+                                       var article = $("RROW-" + getActiveArticleId());
                                        var prev_article = $("RROW-" + prev_id);
                                        var ctr = $("headlines-frame");
 
-                                       if (!noscroll && article && article.offsetTop < ctr.scrollTop) {
-                                               scrollArticle(-ctr.offsetHeight/2);
-                                       } else if (!noscroll && prev_article &&
-                                                       prev_article.offsetTop < ctr.scrollTop) {
-                                               cdmExpandArticle(prev_id);
-                                               scrollArticle(-ctr.offsetHeight/2);
-                                       } else if (prev_id) {
-                                               cdmExpandArticle(prev_id);
-                                               cdmScrollToArticleId(prev_id);
+                                       if (!getInitParam("cdm_expanded")) {
+
+                                               if (!noscroll && article.offsetTop < ctr.scrollTop) {
+                                                       scrollArticle(-ctr.offsetHeight/4);
+                                               } else {
+                                                       cdmExpandArticle(prev_id, noexpand);
+                                                       cdmScrollToArticleId(prev_id, true);
+                                               }
+                                       } else {
+
+                                               if (!noscroll && article && article.offsetTop < ctr.scrollTop) {
+                                                       scrollArticle(-ctr.offsetHeight/3);
+                                               } else if (!noscroll && prev_article &&
+                                                               prev_article.offsetTop < ctr.scrollTop) {
+                                                       cdmExpandArticle(prev_id, noexpand);
+                                                       scrollArticle(-ctr.offsetHeight/4);
+                                               } else if (prev_id) {
+                                                       cdmExpandArticle(prev_id, noexpand);
+                                                       cdmScrollToArticleId(prev_id, noscroll);
+                                               }
                                        }
+
                                } else if (prev_id) {
                                        correctHeadlinesOffset(prev_id);
-                                       view(prev_id, getActiveFeedId());
+                                       view(prev_id, getActiveFeedId(), noexpand);
                                }
                        }
                }
@@ -604,11 +625,12 @@ function moveToPost(mode, noscroll) {
 
 function toggleSelected(id, force_on) {
        try {
-
-               var cb = dijit.byId("RCHK-" + id);
                var row = $("RROW-" + id);
 
                if (row) {
+                       var cb = dijit.getEnclosingWidget(
+                                       row.getElementsByClassName("rchk")[0]);
+
                        if (row.hasClassName('Selected') && !force_on) {
                                row.removeClassName('Selected');
                                if (cb) cb.attr("checked", false);
@@ -642,12 +664,6 @@ function toggleUnread(id, cmode, effect) {
                                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.addClassName("Unread");
                                }
@@ -656,12 +672,6 @@ function toggleUnread(id, cmode, effect) {
 
                                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 if (cmode == 1) {
                                row.addClassName("Unread");
                        }
@@ -696,7 +706,7 @@ function selectionRemoveLabel(id, ids) {
                        return;
                }
 
-               var query = "?op=rpc&method=removeFromLabel&ids=" +
+               var query = "?op=article&method=removeFromLabel&ids=" +
                        param_escape(ids.toString()) + "&lid=" + param_escape(id);
 
                console.log(query);
@@ -724,7 +734,7 @@ function selectionAssignLabel(id, ids) {
                        return;
                }
 
-               var query = "?op=rpc&method=assignToLabel&ids=" +
+               var query = "?op=article&method=assignToLabel&ids=" +
                        param_escape(ids.toString()) + "&lid=" + param_escape(id);
 
                console.log(query);
@@ -742,9 +752,9 @@ function selectionAssignLabel(id, ids) {
        }
 }
 
-function selectionToggleUnread(set_state, callback, no_error) {
+function selectionToggleUnread(set_state, callback, no_error, ids) {
        try {
-               var rows = getSelectedArticleIds2();
+               var rows = ids ? ids : getSelectedArticleIds2();
 
                if (rows.length == 0 && !no_error) {
                        alert(__("No articles are selected."));
@@ -803,12 +813,13 @@ function selectionToggleUnread(set_state, callback, no_error) {
        }
 }
 
-function selectionToggleMarked() {
+// sel_state ignored
+function selectionToggleMarked(sel_state, callback, no_error, ids) {
        try {
 
-               var rows = getSelectedArticleIds2();
+               var rows = ids ? ids : getSelectedArticleIds2();
 
-               if (rows.length == 0) {
+               if (rows.length == 0 && !no_error) {
                        alert(__("No articles are selected."));
                        return;
                }
@@ -826,6 +837,7 @@ function selectionToggleMarked() {
                                parameters: query,
                                onComplete: function(transport) {
                                        handle_rpc_json(transport);
+                                       if (callback) callback(transport);
                                } });
 
                }
@@ -835,12 +847,13 @@ function selectionToggleMarked() {
        }
 }
 
-function selectionTogglePublished() {
+// sel_state ignored
+function selectionTogglePublished(sel_state, callback, no_error, ids) {
        try {
 
-               var rows = getSelectedArticleIds2();
+               var rows = ids ? ids : getSelectedArticleIds2();
 
-               if (rows.length == 0) {
+               if (rows.length == 0 && !no_error) {
                        alert(__("No articles are selected."));
                        return;
                }
@@ -900,7 +913,9 @@ function selectArticles(mode) {
 
                children.each(function(child) {
                        var id = child.id.replace("RROW-", "");
-                       var cb = dijit.byId("RCHK-" + id);
+
+                       var cb = dijit.getEnclosingWidget(
+                                       child.getElementsByClassName("rchk")[0]);
 
                        if (mode == "all") {
                                child.addClassName("Selected");
@@ -914,9 +929,7 @@ function selectArticles(mode) {
                                        if (cb) cb.attr("checked", false);
                                }
                        } else if (mode == "marked") {
-                               var img = $("FMPIC-" + child.id.replace("RROW-", ""));
-
-                               if (img && img.src.match("mark_set")) {
+                               if (child.hasClassName("marked")) {
                                        child.addClassName("Selected");
                                        if (cb) cb.attr("checked", true);
                                } else {
@@ -924,9 +937,7 @@ function selectArticles(mode) {
                                        if (cb) cb.attr("checked", false);
                                }
                        } else if (mode == "published") {
-                               var img = $("FPPIC-" + child.id.replace("RROW-", ""));
-
-                               if (img && img.src.match("pub_set")) {
+                               if (child.hasClassName("published")) {
                                        child.addClassName("Selected");
                                        if (cb) cb.attr("checked", true);
                                } else {
@@ -954,23 +965,6 @@ function selectArticles(mode) {
        }
 }
 
-function catchupPage() {
-
-       var fn = getFeedName(getActiveFeedId(), activeFeedIsCat());
-
-       var str = __("Mark all visible articles in %s as read?");
-
-       str = str.replace("%s", fn);
-
-       if (getInitParam("confirm_feed_catchup") == 1 && !confirm(str)) {
-               return;
-       }
-
-       selectArticles('all');
-       selectionToggleUnread(false, 'viewCurrentFeed()', true);
-       selectArticles('none');
-}
-
 function deleteSelection() {
 
        try {
@@ -986,9 +980,9 @@ function deleteSelection() {
                var str;
 
                if (getActiveFeedId() != 0) {
-                       str = __("Delete %d selected articles in %s?");
+                       str = ngettext("Delete %d selected article in %s?", "Delete %d selected articles in %s?" , rows.length);
                } else {
-                       str = __("Delete %d selected articles?");
+                       str = ngettext("Delete %d selected article?", "Delete %d selected articles?", rows.length);
                }
 
                str = str.replace("%d", rows.length);
@@ -1030,10 +1024,13 @@ function archiveSelection() {
                var op;
 
                if (getActiveFeedId() != 0) {
-                       str = __("Archive %d selected articles in %s?");
+                       str = ngettext("Archive %d selected article in %s?", "Archive %d selected articles in %s?", rows.length);
                        op = "archive";
                } else {
-                       str = __("Move %d archived articles back?");
+                       str = ngettext("Move %d archived article back?", "Move %d archived articles back?", rows.length);
+
+                       str += " " + __("Please note that unstarred articles might get purged on next feed update.");
+
                        op = "unarchive";
                }
 
@@ -1077,7 +1074,7 @@ function catchupSelection() {
 
                var fn = getFeedName(getActiveFeedId(), activeFeedIsCat());
 
-               var str = __("Mark %d selected articles in %s as read?");
+               var str = ngettext("Mark %d selected article in %s as read?", "Mark %d selected articles in %s as read?", rows.length);
 
                str = str.replace("%d", rows.length);
                str = str.replace("%s", fn);
@@ -1094,7 +1091,7 @@ function catchupSelection() {
 }
 
 function editArticleTags(id) {
-               var query = "backend.php?op=dlg&method=editArticleTags&param=" + param_escape(id);
+               var query = "backend.php?op=article&method=editArticleTags&param=" + param_escape(id);
 
                if (dijit.byId("editTagsDlg"))
                        dijit.byId("editTagsDlg").destroyRecursive();
@@ -1112,22 +1109,25 @@ function editArticleTags(id) {
                                        new Ajax.Request("backend.php", {
                                        parameters: query,
                                        onComplete: function(transport) {
-                                               notify('');
-                                               dialog.hide();
+                                               try {
+                                                       notify('');
+                                                       dialog.hide();
 
-                                               var data = JSON.parse(transport.responseText);
+                                                       var data = JSON.parse(transport.responseText);
 
-                                               if (data) {
-                                                       var tags_str = article.tags;
-                                                       var id = tags_str.id;
+                                                       if (data) {
+                                                               var id = data.id;
 
-                                                       var tags = $("ATSTR-" + id);
-                                                       var tooltip = dijit.byId("ATSTRTIP-" + id);
+                                                               console.log(id);
 
-                                                       if (tags) tags.innerHTML = tags_str.content;
-                                                       if (tooltip) tooltip.attr('label', tags_str.content_full);
+                                                               var tags = $("ATSTR-" + id);
+                                                               var tooltip = dijit.byId("ATSTRTIP-" + id);
 
-                                                       cache_delete("article:" + id);
+                                                               if (tags) tags.innerHTML = data.content;
+                                                               if (tooltip) tooltip.attr('label', data.content_full);
+                                                       }
+                                               } catch (e) {
+                                                       exception_error("editArticleTags/inner", e);
                                                }
 
                                        }});
@@ -1140,7 +1140,7 @@ function editArticleTags(id) {
                dojo.disconnect(tmph);
 
                        new Ajax.Autocompleter('tags_str', 'tags_choices',
-                          "backend.php?op=rpc&method=completeTags",
+                          "backend.php?op=article&method=completeTags",
                           { tokens: ',', paramName: "search" });
                });
 
@@ -1148,17 +1148,18 @@ function editArticleTags(id) {
 
 }
 
-function cdmScrollToArticleId(id) {
+function cdmScrollToArticleId(id, force) {
        try {
                var ctr = $("headlines-frame");
                var e = $("RROW-" + id);
 
                if (!e || !ctr) return;
 
-               if (e.offsetTop+e.offsetHeight > (ctr.scrollTop+ctr.offsetHeight) ||
+               if (force || e.offsetTop+e.offsetHeight > (ctr.scrollTop+ctr.offsetHeight) ||
                                e.offsetTop < ctr.scrollTop) {
 
-                       ctr.scrollTop = e.offsetTop;
+                       // expanded cdm has a 4px margin now
+                       ctr.scrollTop = parseInt(e.offsetTop) - 4;
                }
 
        } catch (e) {
@@ -1166,11 +1167,15 @@ function cdmScrollToArticleId(id) {
        }
 }
 
+function setActiveArticleId(id) {
+       _active_article_id = id;
+}
+
 function getActiveArticleId() {
-       return active_post_id;
+       return _active_article_id;
 }
 
-function postMouseIn(id) {
+function postMouseIn(e, id) {
        post_under_pointer = id;
 }
 
@@ -1178,10 +1183,37 @@ function postMouseOut(id) {
        post_under_pointer = false;
 }
 
+function unpackVisibleHeadlines() {
+       try {
+               if (!isCdmMode()) return;
+
+               $$("#headlines-frame > div[id*=RROW]").each(
+                       function(child) {
+                               if (child.offsetTop <= $("headlines-frame").scrollTop +
+                                       $("headlines-frame").offsetHeight) {
+
+                                       var cencw = $("CENCW-" + child.id.replace("RROW-", ""));
+
+                                       if (cencw) {
+                                               cencw.innerHTML = htmlspecialchars_decode(cencw.innerHTML);
+                                               cencw.setAttribute('id', '');
+                                               Element.show(cencw);
+                                       }
+                               }
+                       }
+               );
+
+       } catch (e) {
+               exception_error("unpackVisibleHeadlines", e);
+       }
+}
+
 function headlines_scroll_handler(e) {
        try {
                var hsp = $("headlines-spacer");
 
+               unpackVisibleHeadlines();
+
                if (!_infscroll_disable) {
                        if ((hsp && e.scrollTop + e.offsetHeight >= hsp.offsetTop - hsp.offsetHeight) ||
                                        (e.scrollHeight != 0 &&
@@ -1201,9 +1233,13 @@ function headlines_scroll_handler(e) {
 
                if (getInitParam("cdm_auto_catchup") == 1) {
 
+                       // let's get DOM some time to settle down
+                       var ts = new Date().getTime();
+                       if (ts - _last_headlines_update < 100) return;
+
                        $$("#headlines-frame > div[id*=RROW][class*=Unread]").each(
                                function(child) {
-                                       if ($("headlines-frame").scrollTop >
+                                       if (child.hasClassName("Unread") && $("headlines-frame").scrollTop >
                                                        (child.offsetTop + child.offsetHeight/2)) {
 
                                                var id = child.id.replace("RROW-", "");
@@ -1220,7 +1256,7 @@ function headlines_scroll_handler(e) {
 
                                if (!_infscroll_request_sent) {
                                        catchup_timeout_id = window.setTimeout('catchupBatchedArticles()',
-                                               2000);
+                                               500);
                                }
                        }
                }
@@ -1246,7 +1282,11 @@ function catchupBatchedArticles() {
                                onComplete: function(transport) {
                                        handle_rpc_json(transport);
 
+                                       reply = JSON.parse(transport.responseText);
+                                       var batch = reply.ids;
+
                                        batch.each(function(id) {
+                                               console.log(id);
                                                var elem = $("RROW-" + id);
                                                if (elem) elem.removeClassName("Unread");
                                                catchup_id_batch.remove(id);
@@ -1304,7 +1344,7 @@ function catchupRelativeToArticle(below, id) {
                if (ids_to_mark.length == 0) {
                        alert(__("No articles found to mark"));
                } else {
-                       var msg = __("Mark %d article(s) as read?").replace("%d", ids_to_mark.length);
+                       var msg = ngettext("Mark %d article as read?", "Mark %d articles as read?", ids_to_mark.length).replace("%d", ids_to_mark.length);
 
                        if (getInitParam("confirm_feed_catchup") != 1 || confirm(msg)) {
 
@@ -1330,43 +1370,113 @@ function catchupRelativeToArticle(below, id) {
        }
 }
 
-function cdmExpandArticle(id) {
+function cdmCollapseArticle(event, id) {
+       try {
+               var row = $("RROW-" + id);
+               var elem = $("CICD-" + id);
+
+               if (elem && row) {
+                       var collapse = $$("div#RROW-" + id +
+                               " span[class='collapseBtn']")[0];
+
+                       Element.hide(elem);
+                       Element.show("CEXC-" + id);
+                       Element.hide(collapse);
+                       row.removeClassName("active");
+
+                       markHeadline(id, false);
+
+                       if (id == getActiveArticleId()) {
+                               setActiveArticleId(0);
+                       }
+
+                       if (event) Event.stop(event);
+               }
+
+       } catch (e) {
+               exception_error("cdmCollapseArticle", e);
+       }
+}
+
+function cdmUnexpandArticle(event, id) {
+       try {
+               var row = $("RROW-" + id);
+               var elem = $("CICD-" + id);
+
+               if (elem && row) {
+                       var collapse = $$("div#RROW-" + id +
+                               " span[class='collapseBtn']")[0];
+
+                       Element.hide(elem);
+                       Element.show("CEXC-" + id);
+                       Element.hide(collapse);
+
+                       if (event) Event.stop(event);
+               }
+
+       } catch (e) {
+               exception_error("cdmUnexpandArticle", e);
+       }
+}
+
+function cdmExpandArticle(id, noexpand) {
        try {
+               console.log("cdmExpandArticle " + id);
 
-               hideAuxDlg();
+               if (!$("RROW-" + id)) return false;
 
-               var elem = $("CICD-" + active_post_id);
+               var oldrow = $("RROW-" + getActiveArticleId());
 
-               if (id == active_post_id && Element.visible(elem))
+               var elem = $("CICD-" + getActiveArticleId());
+
+               if (id == getActiveArticleId() && Element.visible(elem))
                        return true;
 
                selectArticles("none");
 
                var old_offset = $("RROW-" + id).offsetTop;
 
-               if (active_post_id && elem && !getInitParam("cdm_expanded")) {
+               if (getActiveArticleId() && elem && !getInitParam("cdm_expanded")) {
+                       var collapse = $$("div#RROW-" + getActiveArticleId() +
+                               " span[class='collapseBtn']")[0];
+
                        Element.hide(elem);
-                       Element.show("CEXC-" + active_post_id);
+                       Element.show("CEXC-" + getActiveArticleId());
+                       Element.hide(collapse);
                }
 
-               active_post_id = id;
+               if (oldrow) oldrow.removeClassName("active");
+
+               setActiveArticleId(id);
 
                elem = $("CICD-" + id);
 
-               if (!Element.visible(elem)) {
+               var collapse = $$("div#RROW-" + id +
+                               " span[class='collapseBtn']")[0];
+
+               var cencw = $("CENCW-" + id);
+
+               if (!Element.visible(elem) && !noexpand) {
+                       if (cencw) {
+                               cencw.innerHTML = htmlspecialchars_decode(cencw.innerHTML);
+                               cencw.setAttribute('id', '');
+                               Element.show(cencw);
+                       }
+
                        Element.show(elem);
                        Element.hide("CEXC-" + id);
+                       Element.show(collapse);
                }
 
-               /* var new_offset = $("RROW-" + id).offsetTop;
+               var new_offset = $("RROW-" + id).offsetTop;
 
-               $("headlines-frame").scrollTop += (new_offset-old_offset);
+               if (old_offset > new_offset)
+                       $("headlines-frame").scrollTop -= (old_offset-new_offset);
 
-               if ($("RROW-" + id).offsetTop != old_offset)
-                       $("headlines-frame").scrollTop = new_offset; */
-
-               toggleUnread(id, 0, true);
+               if (!noexpand)
+                       toggleUnread(id, 0, true);
                toggleSelected(id);
+               $("RROW-" + id).addClassName("active");
 
        } catch (e) {
                exception_error("cdmExpandArticle", e);
@@ -1428,9 +1538,6 @@ function show_labels_in_headlines(transport) {
 
                                if (ctr) ctr.innerHTML = elem.labels;
                        });
-
-                       cache_headlines(getActiveFeedId(), activeFeedIsCat(), null, $("headlines-frame").innerHTML);
-
                }
        } catch (e) {
                exception_error("show_labels_in_headlines", e);
@@ -1441,11 +1548,15 @@ function dismissArticle(id) {
        try {
                var elem = $("RROW-" + id);
 
+               if (!elem) return;
+
                toggleUnread(id, 0, true);
 
                new Effect.Fade(elem, {duration : 0.5});
 
-               active_post_id = false;
+               if (id == getActiveArticleId()) {
+                       setActiveArticleId(0);
+               }
 
        } catch (e) {
                exception_error("dismissArticle", e);
@@ -1463,7 +1574,7 @@ function dismissSelectedArticles() {
                        var elem = $("RROW-" + ids[i]);
 
                        if (elem.className && elem.hasClassName("Selected") &&
-                                       ids[i] != active_post_id) {
+                                       ids[i] != getActiveArticleId()) {
                                new Effect.Fade(elem, {duration : 0.5});
                                sel.push(ids[i]);
                        } else {
@@ -1528,24 +1639,26 @@ function cdmClicked(event, id) {
        try {
                //var shift_key = event.shiftKey;
 
-               hideAuxDlg();
-
                if (!event.ctrlKey) {
 
                        if (!getInitParam("cdm_expanded")) {
                                return cdmExpandArticle(id);
                        } else {
 
+                               var elem = $("RROW-" + getActiveArticleId());
+
+                               if (elem) elem.removeClassName("active");
+
                                selectArticles("none");
                                toggleSelected(id);
 
                                var elem = $("RROW-" + id);
                                var article_is_unread = elem.hasClassName("Unread");
 
-                               if (elem)
-                                       elem.removeClassName("Unread");
+                               elem.removeClassName("Unread");
+                               elem.addClassName("active");
 
-                               active_post_id = id;
+                               setActiveArticleId(id);
 
                                if (article_is_unread) {
                                        decrementFeedCounter(getActiveFeedId(), activeFeedIsCat());
@@ -1560,7 +1673,7 @@ function cdmClicked(event, id) {
                                                handle_rpc_json(transport);
                                        } });
 
-                               return true;
+                               return !event.shiftKey;
                        }
 
                } else {
@@ -1628,16 +1741,22 @@ function isCdmMode() {
        return getInitParam("combined_display_mode");
 }
 
-function markHeadline(id) {
+function markHeadline(id, marked) {
+       if (marked == undefined) marked = true;
+
        var row = $("RROW-" + id);
        if (row) {
-               var check = dijit.byId("RCHK-" + id);
+               var check = dijit.getEnclosingWidget(
+                               row.getElementsByClassName("rchk")[0]);
 
                if (check) {
-                       check.attr("checked", true);
+                       check.attr("checked", marked);
                }
 
-               row.addClassName("Selected");
+               if (marked)
+                       row.addClassName("Selected");
+               else
+                       row.removeClassName("Selected");
        }
 }
 
@@ -1765,6 +1884,47 @@ function initHeadlinesMenu() {
                                openArticleInNewWindow(this.getParent().callerRowId);
                        }}));
 
+               menu.addChild(new dijit.MenuItem({
+                       label: __("Display article URL"),
+                       onClick: function(event) {
+                               displayArticleUrl(this.getParent().callerRowId);
+                       }}));
+
+               menu.addChild(new dijit.MenuSeparator());
+
+               menu.addChild(new dijit.MenuItem({
+                       label: __("Toggle unread"),
+                       onClick: function(event) {
+                               var ids = getSelectedArticleIds2();
+                               // cast to string
+                               var id = this.getParent().callerRowId + "";
+                               ids = ids.size() != 0 && ids.indexOf(id) != -1 ? ids : [id];
+
+                               selectionToggleUnread(undefined, false, true, ids);
+                               }}));
+
+               menu.addChild(new dijit.MenuItem({
+                       label: __("Toggle marked"),
+                       onClick: function(event) {
+                               var ids = getSelectedArticleIds2();
+                               // cast to string
+                               var id = this.getParent().callerRowId + "";
+                               ids = ids.size() != 0 && ids.indexOf(id) != -1 ? ids : [id];
+
+                               selectionToggleMarked(undefined, false, true, ids);
+                               }}));
+
+               menu.addChild(new dijit.MenuItem({
+                       label: __("Toggle published"),
+                       onClick: function(event) {
+                               var ids = getSelectedArticleIds2();
+                               // cast to string
+                               var id = this.getParent().callerRowId + "";
+                               ids = ids.size() != 0 && ids.indexOf(id) != -1 ? ids : [id];
+
+                               selectionTogglePublished(undefined, false, true, ids);
+                               }}));
+
                menu.addChild(new dijit.MenuSeparator());
 
                menu.addChild(new dijit.MenuItem({
@@ -1794,7 +1954,7 @@ function initHeadlinesMenu() {
                                var bare_id = id.substr(id.indexOf(":")+1);
                                var name = label.name[0];
 
-                               bare_id = -11-bare_id;
+                               bare_id = feed_to_label_id(bare_id);
 
                                labelAddMenu.addChild(new dijit.MenuItem({
                                        label: name,
@@ -1896,107 +2056,6 @@ function cache_delete(id) {
                sessionStorage.removeItem(id);
 }
 
-function cache_headlines(feed, is_cat, toolbar_obj, content_obj) {
-       if (toolbar_obj && content_obj) {
-               cache_set("feed:" + feed + ":" + is_cat,
-                       JSON.stringify({toolbar: toolbar_obj, content: content_obj}));
-       } else {
-               try {
-                       obj =   cache_get("feed:" + feed + ":" + is_cat);
-
-                       if (obj) {
-                               obj = JSON.parse(obj);
-
-                               if (toolbar_obj) obj.toolbar = toolbar_obj;
-                               if (content_obj) obj.content = content_obj;
-
-                               cache_set("feed:" + feed + ":" + is_cat, JSON.stringify(obj));
-                       }
-
-               } catch (e) {
-                       console.warn("cache_headlines failed: " + e);
-               }
-       }
-}
-
-function render_local_headlines(feed, is_cat, obj) {
-       try {
-
-               dijit.byId("headlines-toolbar").attr('content',
-                       obj.toolbar);
-
-               dijit.byId("headlines-frame").attr('content',
-                       obj.content);
-
-               dojo.parser.parse('headlines-toolbar');
-
-               $("headlines-frame").scrollTop = 0;
-               selectArticles('none');
-               setActiveFeedId(feed, is_cat);
-               initHeadlinesMenu();
-
-               dijit.getEnclosingWidget(
-                       document.forms["main_toolbar_form"].update).attr('disabled',
-                               is_cat || feed <= 0);
-
-               precache_headlines();
-
-       } catch (e) {
-               exception_error("render_local_headlines", e);
-       }
-}
-
-function precache_headlines_idle() {
-       try {
-               if (getInitParam("bw_limit") != "1" && !feed_precache_timeout_id) {
-                       if (get_timestamp() - _viewfeed_last > 120) {
-
-                               var feeds = dijit.byId("feedTree").getVisibleUnreadFeeds();
-                               var uncached = [];
-
-                               feeds.each(function(item) {
-                                       if (parseInt(item[0]) > 0 && !cache_get("feed:" + item[0] + ":" + item[1]))
-                                               uncached.push(item);
-                               });
-
-                               if (uncached.length > 0) {
-                                       var rf = uncached[Math.floor(Math.random()*uncached.length)];
-                                       viewfeed(rf[0], '', rf[1], 0, true);
-                               }
-                       }
-               }
-               precache_idle_timeout_id = setTimeout("precache_headlines_idle()", 1000*30);
-
-       } catch (e) {
-               exception_error("precache_headlines_idle", e);
-       }
-}
-
-function precache_headlines() {
-       try {
-               if (getInitParam("bw_limit") != "1" && !feed_precache_timeout_id) {
-
-                       feed_precache_timeout_id = window.setTimeout(function() {
-                               var nuf = getNextUnreadFeed(getActiveFeedId(), activeFeedIsCat());
-                               var nf = dijit.byId("feedTree").getNextFeed(getActiveFeedId(), activeFeedIsCat());
-
-                               if (nuf && !cache_get("feed:" + nuf + ":" + activeFeedIsCat()))
-                                       viewfeed(nuf, '', activeFeedIsCat(), 0, true);
-
-                               if (nf && nf[0] != nuf && !cache_get("feed:" + nf[0] + ":" + nf[1]))
-                                       viewfeed(nf[0], '', nf[1], 0, true);
-
-                               window.setTimeout(function() {
-                                       feed_precache_timeout_id = false;
-                                       }, 3000);
-                       }, 1000);
-               }
-
-       } catch (e) {
-               exception_error("precache_headlines", e);
-       }
-}
-
 function cancelSearch() {
        try {
                _search_query = "";
@@ -2016,7 +2075,7 @@ function setSelectionScore() {
                        var score = prompt(__("Please enter new score for selected articles:"), score);
 
                        if (score != undefined) {
-                               var query = "op=rpc&method=setScore&id=" + param_escape(ids.toString()) +
+                               var query = "op=article&method=setScore&id=" + param_escape(ids.toString()) +
                                        "&score=" + param_escape(score);
 
                                new Ajax.Request("backend.php", {
@@ -2059,7 +2118,7 @@ function changeScore(id, pic) {
 
                if (new_score != undefined) {
 
-                       var query = "op=rpc&method=setScore&id=" + param_escape(id) +
+                       var query = "op=article&method=setScore&id=" + param_escape(id) +
                                "&score=" + param_escape(new_score);
 
                        new Ajax.Request("backend.php", {
@@ -2077,3 +2136,35 @@ function changeScore(id, pic) {
                exception_error("changeScore", e);
        }
 }
+
+function displayArticleUrl(id) {
+       try {
+               var query = "op=rpc&method=getlinktitlebyid&id=" + param_escape(id);
+
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
+                               onComplete: function(transport) {
+                                       var reply = JSON.parse(transport.responseText);
+
+                                       if (reply && reply.link) {
+                                               prompt(__("Article URL:"), reply.link);
+                                       }
+                               } });
+       } catch (e) {
+               exception_error("changeScore", e);
+       }
+}
+
+function openSelectedAttachment(elem) {
+       try {
+               var url = elem[elem.selectedIndex].value;
+
+               if (url) {
+                       window.open(url);
+                       elem.selectedIndex = 0;
+               }
+
+       } catch (e) {
+               exception_error("openSelectedAttachment", e);
+       }
+}