]> git.wh0rd.org - tt-rss.git/blobdiff - js/viewfeed.js
scroll handler: performance improvements
[tt-rss.git] / js / viewfeed.js
index c457a9a38da8913cdf1e8dab536ceb6729056505..6ae9cdd8a503fe42cd51c65775de293d81e41d2c 100755 (executable)
@@ -1,60 +1,46 @@
-var _active_article_id = 0;
+/* global dijit, __ */
 
-var vgroup_last_feed = false;
-var post_under_pointer = false;
+let _active_article_id = 0;
 
-var last_requested_article = false;
+let vgroup_last_feed = false;
+let post_under_pointer = false;
 
-var catchup_id_batch = [];
-var catchup_timeout_id = false;
+let last_requested_article = 0;
 
-var cids_requested = [];
-var loaded_article_ids = [];
-var _last_headlines_update = 0;
-var _headlines_scroll_offset = 0;
-var current_first_id = 0;
-var last_search_query;
+let catchup_id_batch = [];
+let catchup_timeout_id = false;
 
-var _catchup_request_sent = false;
+let cids_requested = [];
+let loaded_article_ids = [];
+let _last_headlines_update = 0;
+let _headlines_scroll_offset = 0;
+let current_first_id = 0;
+let last_search_query;
 
-var has_storage = 'sessionStorage' in window && window['sessionStorage'] !== null;
+let _catchup_request_sent = false;
+
+let has_storage = 'sessionStorage' in window && window['sessionStorage'] !== null;
 
 function headlines_callback2(transport, offset, background, infscroll_req) {
-       handle_rpc_json(transport);
+       const reply = handle_rpc_json(transport);
 
        console.log("headlines_callback2 [offset=" + offset + "] B:" + background + " I:" + infscroll_req);
 
+       if (background)
+               return;
+
        var is_cat = false;
        var feed_id = false;
 
-       var reply = false;
-
-       try {
-               reply = JSON.parse(transport.responseText);
-       } catch (e) {
-               console.error(e);
-       }
-
        if (reply) {
 
                is_cat = reply['headlines']['is_cat'];
                feed_id = reply['headlines']['id'];
                last_search_query = reply['headlines']['search_query'];
 
-               if (background) {
-                       var content = reply['headlines']['content'];
-
-                       content = content + "<div id='headlines-spacer'></div>";
-                       return;
-               }
-
                if (feed_id != -7 && (feed_id != getActiveFeedId() || is_cat != activeFeedIsCat()))
                        return;
 
-               /* dijit.getEnclosingWidget(
-                       document.forms["main_toolbar_form"].update).attr('disabled',
-                               is_cat || feed_id <= 0); */
-
                try {
                        if (infscroll_req == false) {
                                $("headlines-frame").scrollTop = 0;
@@ -63,14 +49,14 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
                                $("floatingTitle").setAttribute("data-article-id", 0);
                                $("floatingTitle").innerHTML = "";
                        }
-               } catch (e) { };
+               } catch (e) { }
 
                $("headlines-frame").removeClassName("cdm");
                $("headlines-frame").removeClassName("normal");
 
                $("headlines-frame").addClassName(isCdmMode() ? "cdm" : "normal");
 
-               var headlines_count = reply['headlines-info']['count'];
+               const headlines_count = reply['headlines-info']['count'];
 
                vgroup_last_feed = reply['headlines-info']['vgroup_last_feed'];
 
@@ -81,9 +67,8 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
                }
 
                current_first_id = reply['headlines']['first_id'];
-               var counters = reply['counters'];
-               var articles = reply['articles'];
-               //var runtime_info = reply['runtime-info'];
+               const counters = reply['counters'];
+               const articles = reply['articles'];
 
                if (infscroll_req == false) {
                        loaded_article_ids = [];
@@ -92,17 +77,9 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
                                        reply['headlines']['toolbar'],
                                        {parseContent: true});
 
-                       /*dojo.html.set($("headlines-frame"),
-                               reply['headlines']['content'],
-                               {parseContent: true});
-
-                       $$("#headlines-frame div[id*='RROW']").each(function(row) {
-                               loaded_article_ids.push(row.id);
-                       });*/
-
                        $("headlines-frame").innerHTML = '';
 
-                       var tmp = new Element("div");
+                       let tmp = document.createElement("div");
                        tmp.innerHTML = reply['headlines']['content'];
                        dojo.parser.parse(tmp);
 
@@ -116,7 +93,7 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
                                }
                        }
 
-                       var hsp = $("headlines-spacer");
+                       let hsp = $("headlines-spacer");
                        if (!hsp) hsp = new Element("DIV", {"id": "headlines-spacer"});
                        dijit.byId('headlines-frame').domNode.appendChild(hsp);
 
@@ -132,25 +109,23 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
                                        "</span>";
                        }
 
-               } else {
-
-                       if (headlines_count > 0 && feed_id == getActiveFeedId() && is_cat == activeFeedIsCat()) {
+               } else if (headlines_count > 0 && feed_id == getActiveFeedId() && is_cat == activeFeedIsCat()) {
                                console.log("adding some more headlines: " + headlines_count);
 
-                               var c = dijit.byId("headlines-frame");
-                               var ids = getSelectedArticleIds2();
+                               const c = dijit.byId("headlines-frame");
+                               const ids = getSelectedArticleIds2();
 
-                               var hsp = $("headlines-spacer");
+                               let hsp = $("headlines-spacer");
 
                                if (hsp)
                                        c.domNode.removeChild(hsp);
 
-                               var tmp = new Element("div");
+                               let tmp = document.createElement("div");
                                tmp.innerHTML = reply['headlines']['content'];
                                dojo.parser.parse(tmp);
 
                                while (tmp.hasChildNodes()) {
-                                       var row = tmp.removeChild(tmp.firstChild);
+                                       let row = tmp.removeChild(tmp.firstChild);
 
                                        if (loaded_article_ids.indexOf(row.id) == -1 || row.hasClassName("cdmFeedTitle")) {
                                                dijit.byId("headlines-frame").domNode.appendChild(row);
@@ -166,7 +141,7 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
 
                                console.log("restore selected ids: " + ids);
 
-                               for (var i = 0; i < ids.length; i++) {
+                               for (let i = 0; i < ids.length; i++) {
                                        markHeadline(ids[i]);
                                }
 
@@ -180,10 +155,10 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
                        } else {
                                console.log("no new headlines received");
 
-                               var first_id_changed = reply['headlines']['first_id_changed'];
+                               const first_id_changed = reply['headlines']['first_id_changed'];
                                console.log("first id changed:" + first_id_changed);
 
-                               var hsp = $("headlines-spacer");
+                               let hsp = $("headlines-spacer");
 
                                if (hsp) {
                                        if (first_id_changed) {
@@ -197,11 +172,10 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
                                }
 
                        }
-               }
 
                if (articles) {
-                       for (var i = 0; i < articles.length; i++) {
-                               var a_id = articles[i]['id'];
+                       for (let i = 0; i < articles.length; i++) {
+                               const a_id = articles[i]['id'];
                                cache_set("article:" + a_id, articles[i]['content']);
                        }
                } else {
@@ -244,11 +218,11 @@ function render_article(article) {
        dijit.byId("headlines-wrap-inner").addChild(
                        dijit.byId("content-insert"));
 
-       var c = dijit.byId("content-insert");
+       const c = dijit.byId("content-insert");
 
        try {
                c.domNode.scrollTop = 0;
-       } catch (e) { };
+       } catch (e) { }
 
        c.attr('content', article);
        PluginHost.run(PluginHost.HOOK_ARTICLE_RENDERED, c.domNode);
@@ -257,11 +231,11 @@ function render_article(article) {
 
        try {
                c.focus();
-       } catch (e) { };
+       } catch (e) { }
 }
 
 function showArticleInHeadlines(id, noexpand) {
-       var row = $("RROW-" + id);
+       const row = $("RROW-" + id);
        if (!row) return;
 
        if (!noexpand)
@@ -277,15 +251,7 @@ function showArticleInHeadlines(id, noexpand) {
 function article_callback2(transport, id) {
        console.log("article_callback2 " + id);
 
-       handle_rpc_json(transport);
-
-       var reply = false;
-
-       try {
-               reply = JSON.parse(transport.responseText);
-       } catch (e) {
-               console.error(e);
-       }
+       const reply = handle_rpc_json(transport);
 
        if (reply) {
 
@@ -298,11 +264,6 @@ function article_callback2(transport, id) {
                        cache_set("article:" + article['id'], article['content']);
                });
 
-//                     if (id != last_requested_article) {
-//                             console.log("requested article id is out of sequence, aborting");
-//                             return;
-//                     }
-
        } else {
                console.error("Invalid object received: " + transport.responseText);
 
@@ -310,17 +271,17 @@ function article_callback2(transport, id) {
                                __('Could not display article (invalid object received - see error console for details)') + "</div>");
        }
 
-       var unread_in_buffer = $$("#headlines-frame > div[id*=RROW][class*=Unread]").length
+       const unread_in_buffer = $$("#headlines-frame > div[id*=RROW][class*=Unread]").length;
        request_counters(unread_in_buffer == 0);
 
        notify("");
 }
 
 function view(id, activefeed, noexpand) {
-       var oldrow = $("RROW-" + getActiveArticleId());
+       const oldrow = $("RROW-" + getActiveArticleId());
        if (oldrow) oldrow.removeClassName("active");
 
-       var crow = $("RROW-" + id);
+       const crow = $("RROW-" + id);
 
        if (!crow) return;
        if (noexpand) {
@@ -331,19 +292,19 @@ function view(id, activefeed, noexpand) {
 
        console.log("loading article: " + id);
 
-       var cached_article = cache_get("article:" + id);
+       const cached_article = cache_get("article:" + id);
 
        console.log("cache check result: " + (cached_article != false));
 
-       var query = "?op=article&method=view&id=" + param_escape(id);
+       const query = {op: "article", method: "view", id: id};
 
-       var neighbor_ids = getRelativePostIds(id);
+       const neighbor_ids = getRelativePostIds(id);
 
        /* only request uncached articles */
 
-       var cids_to_request = [];
+       const cids_to_request = [];
 
-       for (var i = 0; i < neighbor_ids.length; i++) {
+       for (let i = 0; i < neighbor_ids.length; i++) {
                if (cids_requested.indexOf(neighbor_ids[i]) == -1)
                        if (!cache_get("article:" + neighbor_ids[i])) {
                                cids_to_request.push(neighbor_ids[i]);
@@ -353,22 +314,18 @@ function view(id, activefeed, noexpand) {
 
        console.log("additional ids: " + cids_to_request.toString());
 
-       query = query + "&cids=" + cids_to_request.toString();
+       query.cids = cids_to_request.toString();
 
-       var article_is_unread = crow.hasClassName("Unread");
+       const article_is_unread = crow.hasClassName("Unread");
 
        setActiveArticleId(id);
        showArticleInHeadlines(id);
 
        if (cached_article && article_is_unread) {
-
-               query = query + "&mode=prefetch";
-
+               query.mode = "prefetch";
                render_article(cached_article);
-
        } else if (cached_article) {
-
-               query = query + "&mode=prefetch_old";
+        query.mode = "prefetch_old";
                render_article(cached_article);
 
                // if we don't need to request any relative ids, we might as well skip
@@ -386,99 +343,93 @@ function view(id, activefeed, noexpand) {
                decrementFeedCounter(getActiveFeedId(), activeFeedIsCat());
        }
 
-       new Ajax.Request("backend.php", {
-               parameters: query,
-               onComplete: function(transport) {
-                       article_callback2(transport, id);
-               } });
+       xhrPost("backend.php", query, (transport) => {
+        article_callback2(transport, id);
+       })
 
        return false;
 
 }
 
 function toggleMark(id, client_only) {
-       var query = "?op=rpc&id=" + id + "&method=mark";
+       const query = { op: "rpc", id: id, method: "mark" };
 
-       var row = $("RROW-" + id);
+       const row = $("RROW-" + id);
        if (!row) return;
 
-       var imgs = [];
+       const imgs = [];
 
-       var row_imgs = row.getElementsByClassName("markedPic");
+       const row_imgs = row.getElementsByClassName("markedPic");
 
-       for (var i = 0; i < row_imgs.length; i++)
+       for (let i = 0; i < row_imgs.length; i++)
                imgs.push(row_imgs[i]);
 
-       var ft = $("floatingTitle");
+       const ft = $("floatingTitle");
 
        if (ft && ft.getAttribute("data-article-id") == id) {
-               var fte = ft.getElementsByClassName("markedPic");
+               const fte = ft.getElementsByClassName("markedPic");
 
                for (var i = 0; i < fte.length; i++)
                        imgs.push(fte[i]);
        }
 
        for (i = 0; i < imgs.length; i++) {
-               var img = imgs[i];
+               const img = imgs[i];
 
                if (!row.hasClassName("marked")) {
                        img.src = img.src.replace("mark_unset", "mark_set");
-                       query = query + "&mark=1";
+                       query.mark = 1;
                } else {
                        img.src = img.src.replace("mark_set", "mark_unset");
-                       query = query + "&mark=0";
+                       query.mark = 0;
                }
        }
 
        row.toggleClassName("marked");
 
-       if (!client_only) {
-               new Ajax.Request("backend.php", {
-                       parameters: query,
-                       onComplete: function (transport) {
-                               handle_rpc_json(transport);
-                       }
+       if (!client_only)
+               xhrPost("backend.php", query, (transport) => {
+                       handle_rpc_json(transport);
                });
        }
-}
 
 function togglePub(id, client_only, no_effects, note) {
-       var query = "?op=rpc&id=" + id + "&method=publ";
+    const query = { op: "rpc", id: id, method: "publ" };
 
        if (note != undefined) {
-               query = query + "&note=" + param_escape(note);
+               query.note = note;
        } else {
-               query = query + "&note=undefined";
+               query.note = "undefined";
        }
 
-       var row = $("RROW-" + id);
+       const row = $("RROW-" + id);
        if (!row) return;
 
-       var imgs = [];
+       const imgs = [];
 
-       var row_imgs = row.getElementsByClassName("pubPic");
+       const row_imgs = row.getElementsByClassName("pubPic");
 
-       for (var i = 0; i < row_imgs.length; i++)
+       for (let i = 0; i < row_imgs.length; i++)
                imgs.push(row_imgs[i]);
 
-       var ft = $("floatingTitle");
+       const ft = $("floatingTitle");
 
        if (ft && ft.getAttribute("data-article-id") == id) {
-               var fte = ft.getElementsByClassName("pubPic");
+               const fte = ft.getElementsByClassName("pubPic");
 
-               for (var i = 0; i < fte.length; i++)
+               for (let i = 0; i < fte.length; i++)
                        imgs.push(fte[i]);
        }
 
-       for (var i = 0; i < imgs.length; i++) {
-               var img = imgs[i];
+       for (let i = 0; i < imgs.length; i++) {
+               const img = imgs[i];
 
                if (!row.hasClassName("published") || note != undefined) {
                        img.src = img.src.replace("pub_unset", "pub_set");
-                       query = query + "&pub=1";
+                       query.pub = 1;
                } else {
                        img.src = img.src.replace("pub_set", "pub_unset");
-                       query = query + "&pub=0";
+                       query.pub = 0;
                }
        }
 
@@ -487,21 +438,17 @@ function togglePub(id, client_only, no_effects, note) {
        else
                row.toggleClassName("published");
 
-       if (!client_only) {
-               new Ajax.Request("backend.php", {
-                       parameters: query,
-                       onComplete: function(transport) {
+       if (!client_only)
+               xhrPost("backend.php", query, (transport) => {
                                handle_rpc_json(transport);
-                       } });
-       }
-
+               });
 }
 
 function moveToPost(mode, noscroll, noexpand) {
-       var rows = getLoadedArticleIds();
+       const rows = getLoadedArticleIds();
 
-       var prev_id = false;
-       var next_id = false;
+       let prev_id = false;
+       let next_id = false;
 
        if (!$('RROW-' + getActiveArticleId())) {
                setActiveArticleId(0);
@@ -511,13 +458,13 @@ function moveToPost(mode, noscroll, noexpand) {
                next_id = rows[0];
                prev_id = rows[rows.length-1]
        } else {
-               for (var i = 0; i < rows.length; i++) {
+               for (let i = 0; i < rows.length; i++) {
                        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++) {
+                               for (let j = i+1; j < rows.length; j++) {
                                        if (rows[j] != getActiveArticleId()) {
                                                next_id = rows[j];
                                                break;
@@ -543,7 +490,6 @@ function moveToPost(mode, noscroll, noexpand) {
                                        scrollArticle(ctr.offsetHeight/4);
 
                                } else if (next_id) {
-                                       cdmExpandArticle(next_id, noexpand);
                                        cdmScrollToArticleId(next_id, true);
                                }
 
@@ -559,29 +505,16 @@ function moveToPost(mode, noscroll, noexpand) {
                        if (isCdmMode()) {
 
                                var article = $("RROW-" + getActiveArticleId());
-                               var prev_article = $("RROW-" + prev_id);
+                               const prev_article = $("RROW-" + prev_id);
                                var ctr = $("headlines-frame");
 
-                               if (!getInitParam("cdm_expanded")) {
-
-                                       if (!noscroll && article && 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);
-                                       }
+                               if (!noscroll && article && article.offsetTop < ctr.scrollTop) {
+                                       scrollArticle(-ctr.offsetHeight/3);
+                               } else if (!noscroll && prev_article &&
+                                               prev_article.offsetTop < ctr.scrollTop) {
+                                       scrollArticle(-ctr.offsetHeight/4);
+                               } else if (prev_id) {
+                                       cdmScrollToArticleId(prev_id, noscroll);
                                }
 
                        } else if (prev_id) {
@@ -594,10 +527,10 @@ function moveToPost(mode, noscroll, noexpand) {
 }
 
 function toggleSelected(id, force_on) {
-       var row = $("RROW-" + id);
+       const row = $("RROW-" + id);
 
        if (row) {
-               var cb = dijit.getEnclosingWidget(
+               const cb = dijit.getEnclosingWidget(
                                row.getElementsByClassName("rchk")[0]);
 
                if (row.hasClassName('Selected') && !force_on) {
@@ -613,8 +546,8 @@ function toggleSelected(id, force_on) {
 }
 
 function updateSelectedPrompt() {
-       var count = getSelectedArticleIds2().size();
-       var elem = $("selected_prompt");
+       const count = getSelectedArticleIds2().length;
+       const elem = $("selected_prompt");
 
        if (elem) {
                elem.innerHTML = ngettext("%d article selected",
@@ -628,10 +561,10 @@ function updateSelectedPrompt() {
 
 }
 
-function toggleUnread(id, cmode, effect) {
-       var row = $("RROW-" + id);
+function toggleUnread(id, cmode) {
+       const row = $("RROW-" + id);
        if (row) {
-               var tmpClassName = row.className;
+               const tmpClassName = row.className;
 
                if (cmode == undefined || cmode == 2) {
                        if (row.hasClassName("Unread")) {
@@ -649,22 +582,17 @@ function toggleUnread(id, cmode, effect) {
                        row.addClassName("Unread");
                }
 
-               if (cmode == undefined) cmode = 2;
-
-               var query = "?op=rpc&method=catchupSelected" +
-                       "&cmode=" + param_escape(cmode) + "&ids=" + param_escape(id);
+               if (tmpClassName != row.className) {
+            if (cmode == undefined) cmode = 2;
 
-//                     notify_progress("Loading, please wait...");
+            const query = {op: "rpc", method: "catchupSelected",
+                cmode: cmode, ids: id};
 
-               if (tmpClassName != row.className) {
-                       new Ajax.Request("backend.php", {
-                               parameters: query,
-                               onComplete: function (transport) {
+            xhrPost("backend.php", query, (transport) => {
                                        handle_rpc_json(transport);
-                               }
+
                        });
                }
-
        }
 }
 
@@ -676,18 +604,13 @@ function selectionRemoveLabel(id, ids) {
                return;
        }
 
-       var query = "?op=article&method=removeFromLabel&ids=" +
-               param_escape(ids.toString()) + "&lid=" + param_escape(id);
-
-       console.log(query);
-
-       new Ajax.Request("backend.php", {
-               parameters: query,
-               onComplete: function(transport) {
-                       handle_rpc_json(transport);
-                       show_labels_in_headlines(transport);
-               } });
+       const query = { op: "article", method: "removeFromLabel",
+               ids: ids.toString(), lid: id };
 
+       xhrPost("backend.php", query, (transport) => {
+        handle_rpc_json(transport);
+        show_labels_in_headlines(transport);
+       });
 }
 
 function selectionAssignLabel(id, ids) {
@@ -698,29 +621,25 @@ function selectionAssignLabel(id, ids) {
                return;
        }
 
-       var query = "?op=article&method=assignToLabel&ids=" +
-               param_escape(ids.toString()) + "&lid=" + param_escape(id);
+       const query = { op: "article", method: "assignToLabel",
+               ids: ids.toString(), lid: id };
 
-       console.log(query);
-
-       new Ajax.Request("backend.php", {
-               parameters: query,
-               onComplete: function(transport) {
-                       handle_rpc_json(transport);
-                       show_labels_in_headlines(transport);
-               } });
+    xhrPost("backend.php", query, (transport) => {
+        handle_rpc_json(transport);
+        show_labels_in_headlines(transport);
+    });
 }
 
 function selectionToggleUnread(set_state, callback, no_error, ids) {
-       var rows = ids ? ids : getSelectedArticleIds2();
+       const rows = ids ? ids : getSelectedArticleIds2();
 
        if (rows.length == 0 && !no_error) {
                alert(__("No articles are selected."));
                return;
        }
 
-       for (var i = 0; i < rows.length; i++) {
-               var row = $("RROW-" + rows[i]);
+       for (let i = 0; i < rows.length; i++) {
+               const row = $("RROW-" + rows[i]);
                if (row) {
                        if (set_state == undefined) {
                                if (row.hasClassName("Unread")) {
@@ -744,7 +663,7 @@ function selectionToggleUnread(set_state, callback, no_error, ids) {
 
        if (rows.length > 0) {
 
-               var cmode = "";
+               let cmode = "";
 
                if (set_state == undefined) {
                        cmode = "2";
@@ -754,79 +673,70 @@ function selectionToggleUnread(set_state, callback, no_error, ids) {
                        cmode = "0";
                }
 
-               var query = "?op=rpc&method=catchupSelected" +
-                       "&cmode=" + cmode + "&ids=" + param_escape(rows.toString());
+               const query = {op: "rpc", method: "catchupSelected",
+                       cmode: cmode, ids: rows.toString() };
 
                notify_progress("Loading, please wait...");
 
-               new Ajax.Request("backend.php", {
-                       parameters: query,
-                       onComplete: function(transport) {
-                               handle_rpc_json(transport);
-                               if (callback) callback(transport);
-                       } });
+        xhrPost("backend.php", query, (transport) => {
+            handle_rpc_json(transport);
+            if (callback) callback(transport);
+        });
 
        }
 }
 
 // sel_state ignored
 function selectionToggleMarked(sel_state, callback, no_error, ids) {
-       var rows = ids ? ids : getSelectedArticleIds2();
+       const rows = ids ? ids : getSelectedArticleIds2();
 
        if (rows.length == 0 && !no_error) {
                alert(__("No articles are selected."));
                return;
        }
 
-       for (var i = 0; i < rows.length; i++) {
+       for (let i = 0; i < rows.length; i++) {
                toggleMark(rows[i], true, true);
        }
 
        if (rows.length > 0) {
+               const query = { op: "rpc", method: "markSelected",
+                       ids:  rows.toString(), cmode: 2 };
 
-               var query = "?op=rpc&method=markSelected&ids=" +
-                       param_escape(rows.toString()) + "&cmode=2";
-
-               new Ajax.Request("backend.php", {
-                       parameters: query,
-                       onComplete: function(transport) {
-                               handle_rpc_json(transport);
-                               if (callback) callback(transport);
-                       } });
-
+        xhrPost("backend.php", query, (transport) => {
+            handle_rpc_json(transport);
+            if (callback) callback(transport);
+        });
        }
 }
 
 // sel_state ignored
 function selectionTogglePublished(sel_state, callback, no_error, ids) {
-       var rows = ids ? ids : getSelectedArticleIds2();
+       const rows = ids ? ids : getSelectedArticleIds2();
 
        if (rows.length == 0 && !no_error) {
                alert(__("No articles are selected."));
                return;
        }
 
-       for (var i = 0; i < rows.length; i++) {
+       for (let i = 0; i < rows.length; i++) {
                togglePub(rows[i], true, true);
        }
 
        if (rows.length > 0) {
+        const query = { op: "rpc", method: "publishSelected",
+            ids:  rows.toString(), cmode: 2 };
 
-               var query = "?op=rpc&method=publishSelected&ids=" +
-                       param_escape(rows.toString()) + "&cmode=2";
-
-               new Ajax.Request("backend.php", {
-                       parameters: query,
-                       onComplete: function(transport) {
-                               handle_rpc_json(transport);
-                       } });
-
+        xhrPost("backend.php", query, (transport) => {
+            handle_rpc_json(transport);
+            if (callback) callback(transport);
+        });
        }
 }
 
 function getSelectedArticleIds2() {
 
-       var rv = [];
+       const rv = [];
 
        $$("#headlines-frame > div[id*=RROW][class*=Selected]").each(
                function(child) {
@@ -837,9 +747,9 @@ function getSelectedArticleIds2() {
 }
 
 function getLoadedArticleIds() {
-       var rv = [];
+       const rv = [];
 
-       var children = $$("#headlines-frame > div[id*=RROW-]");
+       const children = $$("#headlines-frame > div[id*=RROW-]");
 
        children.each(function(child) {
                if (Element.visible(child)) {
@@ -855,12 +765,12 @@ function getLoadedArticleIds() {
 function selectArticles(mode, query) {
        if (!query) query = "#headlines-frame > div[id*=RROW]";
 
-       var children = $$(query);
+       const children = $$(query);
 
        children.each(function(child) {
-               var id = child.getAttribute("data-article-id");
+               //const id = child.getAttribute("data-article-id");
 
-               var cb = dijit.getEnclosingWidget(
+               const cb = dijit.getEnclosingWidget(
                                child.getElementsByClassName("rchk")[0]);
 
                if (mode == "all") {
@@ -911,15 +821,15 @@ function selectArticles(mode, query) {
 
 function deleteSelection() {
 
-       var rows = getSelectedArticleIds2();
+       const rows = getSelectedArticleIds2();
 
        if (rows.length == 0) {
                alert(__("No articles are selected."));
                return;
        }
 
-       var fn = getFeedName(getActiveFeedId(), activeFeedIsCat());
-       var str;
+       const fn = getFeedName(getActiveFeedId(), activeFeedIsCat());
+       let str;
 
        if (getActiveFeedId() != 0) {
                str = ngettext("Delete %d selected article in %s?", "Delete %d selected articles in %s?", rows.length);
@@ -934,79 +844,69 @@ function deleteSelection() {
                return;
        }
 
-       var query = "?op=rpc&method=delete&ids=" + param_escape(rows);
-
-       console.log(query);
+       const query = { op: "rpc", method: "delete", ids: rows.toString() };
 
-       new Ajax.Request("backend.php", {
-               parameters: query,
-               onComplete: function (transport) {
-                       handle_rpc_json(transport);
-                       viewCurrentFeed();
-               }
+       xhrPost("backend.php", query, (transport) => {
+        handle_rpc_json(transport);
+        viewCurrentFeed();
        });
 }
 
 function archiveSelection() {
 
-       var rows = getSelectedArticleIds2();
-
-       if (rows.length == 0) {
-               alert(__("No articles are selected."));
-               return;
-       }
-
-       var fn = getFeedName(getActiveFeedId(), activeFeedIsCat());
-       var str;
-       var op;
+    const rows = getSelectedArticleIds2();
 
-       if (getActiveFeedId() != 0) {
-               str = ngettext("Archive %d selected article in %s?", "Archive %d selected articles in %s?", rows.length);
-               op = "archive";
-       } else {
-               str = ngettext("Move %d archived article back?", "Move %d archived articles back?", rows.length);
+    if (rows.length == 0) {
+        alert(__("No articles are selected."));
+        return;
+    }
 
-               str += " " + __("Please note that unstarred articles might get purged on next feed update.");
+    const fn = getFeedName(getActiveFeedId(), activeFeedIsCat());
+    let str;
+    let op;
 
-               op = "unarchive";
-       }
+    if (getActiveFeedId() != 0) {
+        str = ngettext("Archive %d selected article in %s?", "Archive %d selected articles in %s?", rows.length);
+        op = "archive";
+    } else {
+        str = ngettext("Move %d archived article back?", "Move %d archived articles back?", rows.length);
 
-       str = str.replace("%d", rows.length);
-       str = str.replace("%s", fn);
+        str += " " + __("Please note that unstarred articles might get purged on next feed update.");
 
-       if (getInitParam("confirm_feed_catchup") == 1 && !confirm(str)) {
-               return;
-       }
+        op = "unarchive";
+    }
 
-       var query = "?op=rpc&method="+op+"&ids=" + param_escape(rows);
+    str = str.replace("%d", rows.length);
+    str = str.replace("%s", fn);
 
-       console.log(query);
+    if (getInitParam("confirm_feed_catchup") == 1 && !confirm(str)) {
+        return;
+    }
 
-       for (var i = 0; i < rows.length; i++) {
-               cache_delete("article:" + rows[i]);
-       }
+    for (let i = 0; i < rows.length; i++) {
+        cache_delete("article:" + rows[i]);
+    }
 
-       new Ajax.Request("backend.php", {
-               parameters: query,
-               onComplete: function(transport) {
-                               handle_rpc_json(transport);
-                               viewCurrentFeed();
-                       } });
+    const query = {op: "rpc", method: op, ids: rows.toString()};
 
+    xhrPost("backend.php", query, (transport) => {
+        handle_rpc_json(transport);
+        viewCurrentFeed();
+    });
 }
 
 function catchupSelection() {
 
-       var rows = getSelectedArticleIds2();
+       const rows = getSelectedArticleIds2();
 
        if (rows.length == 0) {
                alert(__("No articles are selected."));
                return;
        }
 
-       var fn = getFeedName(getActiveFeedId(), activeFeedIsCat());
+       const fn = getFeedName(getActiveFeedId(), activeFeedIsCat());
 
-       var str = ngettext("Mark %d selected article in %s as read?", "Mark %d selected articles in %s as read?", rows.length);
+       let 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);
@@ -1019,46 +919,41 @@ function catchupSelection() {
 }
 
 function editArticleTags(id) {
-       var query = "backend.php?op=article&method=editArticleTags&param=" + param_escape(id);
+       const query = "backend.php?op=article&method=editArticleTags&param=" + param_escape(id);
 
        if (dijit.byId("editTagsDlg"))
                dijit.byId("editTagsDlg").destroyRecursive();
 
-       var dialog = new dijit.Dialog({
+       const 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'));
+                               const query = dojo.objectToQuery(this.attr('value'));
 
                                notify_progress("Saving article tags...", true);
 
-                               new Ajax.Request("backend.php", {
-                               parameters: query,
-                               onComplete: function(transport) {
-                                       try {
-                                               notify('');
-                                               dialog.hide();
-
-                                               var data = JSON.parse(transport.responseText);
+                               xhrPost("backend.php", this.attr('value'), (transport) => {
+                    try {
+                        notify('');
+                        dialog.hide();
 
-                                               if (data) {
-                                                       var id = data.id;
+                        const data = JSON.parse(transport.responseText);
 
-                                                       console.log(id);
+                        if (data) {
+                            const id = data.id;
 
-                                                       var tags = $("ATSTR-" + id);
-                                                       var tooltip = dijit.byId("ATSTRTIP-" + id);
+                            const tags = $("ATSTR-" + id);
+                            const tooltip = dijit.byId("ATSTRTIP-" + id);
 
-                                                       if (tags) tags.innerHTML = data.content;
-                                                       if (tooltip) tooltip.attr('label', data.content_full);
-                                               }
-                                       } catch (e) {
-                                               exception_error(e);
-                                       }
-
-                               }});
+                            if (tags) tags.innerHTML = data.content;
+                            if (tooltip) tooltip.attr('label', data.content_full);
+                        }
+                    } catch (e) {
+                        exception_error(e);
+                    }
+                               });
                        }
                },
                href: query
@@ -1077,8 +972,8 @@ function editArticleTags(id) {
 }
 
 function cdmScrollToArticleId(id, force) {
-       var ctr = $("headlines-frame");
-       var e = $("RROW-" + id);
+       const ctr = $("headlines-frame");
+       const e = $("RROW-" + id);
 
        if (!e || !ctr) return;
 
@@ -1110,26 +1005,26 @@ function postMouseOut(id) {
 }
 
 function unpackVisibleHeadlines() {
-       if (!isCdmMode() || !getInitParam("cdm_expanded")) return;
+       if (!isCdmMode()) return;
 
-       $$("#headlines-frame span.cencw[id]").each(
-               function (child) {
-                       var row = $("RROW-" + child.id.replace("CENCW-", ""));
+    const rows = $$("#headlines-frame div[id*=RROW][data-content]");
 
-                       if (row && row.offsetTop <= $("headlines-frame").scrollTop +
-                               $("headlines-frame").offsetHeight) {
+    for (let i = 0; i < rows.length; i++) {
+        const row = rows[i];
 
-                               //console.log("unpacking: " + child.id);
+        if (row.offsetTop <= $("headlines-frame").scrollTop + $("headlines-frame").offsetHeight) {
+            console.log("unpacking: " + row.id);
 
-                               child.innerHTML = htmlspecialchars_decode(child.innerHTML);
-                               child.removeAttribute('id');
+            const content = row.getAttribute("data-content");
 
-                               PluginHost.run(PluginHost.HOOK_ARTICLE_RENDERED_CDM, row);
+            row.select(".cdmContentInner")[0].innerHTML = content;
+            row.removeAttribute("data-content");
 
-                               Element.show(child);
-                       }
-               }
-       );
+            PluginHost.run(PluginHost.HOOK_ARTICLE_RENDERED_CDM, row);
+        } else {
+            break;
+        }
+    }
 }
 
 function headlines_scroll_handler(e) {
@@ -1142,30 +1037,27 @@ function headlines_scroll_handler(e) {
 
                _headlines_scroll_offset = e.scrollTop;
 
-               var hsp = $("headlines-spacer");
-
                unpackVisibleHeadlines();
 
                // set topmost child in the buffer as active
                if (isCdmMode() && getInitParam("cdm_auto_catchup") == 1 &&
-                               getSelectedArticleIds2().length <= 1 &&
-                               getInitParam("cdm_expanded")) {
+                               getSelectedArticleIds2().length <= 1) {
 
-                       var rows = $$("#headlines-frame > div[id*=RROW]");
+                       const rows = $$("#headlines-frame > div[id*=RROW]");
 
-                       for (var i = 0; i < rows.length; i++) {
-                               var child = rows[i];
+                       for (let i = 0; i < rows.length; i++) {
+                               const row = rows[i];
 
-                               if ($("headlines-frame").scrollTop <= child.offsetTop &&
-                                       child.offsetTop - $("headlines-frame").scrollTop < 100 &&
-                                       child.getAttribute("data-article-id") != _active_article_id) {
+                               if ($("headlines-frame").scrollTop <= row.offsetTop &&
+                                       row.offsetTop - $("headlines-frame").scrollTop < 100 &&
+                                       row.getAttribute("data-article-id") != _active_article_id) {
 
                                        if (_active_article_id) {
-                                               var row = $("RROW-" + _active_article_id);
+                                               const row = $("RROW-" + _active_article_id);
                                                if (row) row.removeClassName("active");
                                        }
 
-                                       _active_article_id = child.getAttribute("data-article-id");
+                                       _active_article_id = row.getAttribute("data-article-id");
                                        showArticleInHeadlines(_active_article_id, true);
                                        updateSelectedPrompt();
                                        break;
@@ -1174,6 +1066,8 @@ function headlines_scroll_handler(e) {
                }
 
                if (!_infscroll_disable) {
+            const hsp = $("headlines-spacer");
+
                        if (hsp && hsp.offsetTop - 250 <= e.scrollTop + e.offsetHeight) {
 
                                hsp.innerHTML = "<span class='loading'><img src='images/indicator_tiny.gif'> " +
@@ -1189,34 +1083,31 @@ function headlines_scroll_handler(e) {
                        updateFloatingTitle();
                }
 
-               catchupCurrentBatchIfNeeded();
-
                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 (child.hasClassName("Unread") && $("headlines-frame").scrollTop >
-                                                       (child.offsetTop + child.offsetHeight/2)) {
+                       let rows = $$("#headlines-frame > div[id*=RROW][class*=Unread]");
 
-                                               var id = child.getAttribute("data-article-id")
+                       for (let i = 0; i < rows.length; i++) {
+                const row = rows[i];
+                               
+                               if ($("headlines-frame").scrollTop > (row.offsetTop + row.offsetHeight/2)) {
 
-                                               if (catchup_id_batch.indexOf(id) == -1)
-                                                       catchup_id_batch.push(id);
+                    const id = row.getAttribute("data-article-id")
 
-                                               //console.log("auto_catchup_batch: " + catchup_id_batch.toString());
-                                       }
+                    if (catchup_id_batch.indexOf(id) == -1)
+                        catchup_id_batch.push(id);
 
-                               });
+                    //console.log("auto_catchup_batch: " + catchup_id_batch.toString());
+                } else {
+                                       break;
+                               }
+            }
 
                        if (_infscroll_disable) {
-                               var child = $$("#headlines-frame div[id*=RROW]").last();
+                               const row = $$("#headlines-frame div[id*=RROW]").last();
 
-                               if (child && $("headlines-frame").scrollTop >
-                                               (child.offsetTop + child.offsetHeight - 50)) {
+                               if (row && $("headlines-frame").scrollTop >
+                                               (row.offsetTop + row.offsetHeight - 50)) {
 
                                        console.log("we seem to be at an end");
 
@@ -1233,45 +1124,39 @@ function headlines_scroll_handler(e) {
 }
 
 function openNextUnreadFeed() {
-       var is_cat = activeFeedIsCat();
-       var nuf = getNextUnreadFeed(getActiveFeedId(), is_cat);
+       const is_cat = activeFeedIsCat();
+       const nuf = getNextUnreadFeed(getActiveFeedId(), is_cat);
        if (nuf) viewfeed({feed: nuf, is_cat: is_cat});
 }
 
 function catchupBatchedArticles() {
        if (catchup_id_batch.length > 0 && !_infscroll_request_sent && !_catchup_request_sent) {
 
-               console.log("catchupBatchedArticles: working");
+               console.log("catchupBatchedArticles, size=", catchup_id_batch.length);
 
                // make a copy of the array
-               var batch = catchup_id_batch.slice();
-               var query = "?op=rpc&method=catchupSelected" +
-                       "&cmode=0&ids=" + param_escape(batch.toString());
-
-               console.log(query);
+               const batch = catchup_id_batch.slice();
+               const query = { op: "rpc", method: "catchupSelected",
+                       cmode: 0, ids: batch.toString() };
 
                _catchup_request_sent = true;
 
-               new Ajax.Request("backend.php", {
-                       parameters: query,
-                       onComplete: function (transport) {
-                               handle_rpc_json(transport);
-
-                               _catchup_request_sent = false;
+               xhrPost("backend.php", query, (transport) => {
+            const reply = handle_rpc_json(transport);
 
-                               var reply = JSON.parse(transport.responseText);
-                               var batch = reply.ids;
+            _catchup_request_sent = false;
 
-                               batch.each(function (id) {
-                                       console.log(id);
-                                       var elem = $("RROW-" + id);
-                                       if (elem) elem.removeClassName("Unread");
-                                       catchup_id_batch.remove(id);
-                               });
+            if (reply) {
+                const batch = reply.ids;
 
-                               updateFloatingTitle(true);
+                batch.each(function (id) {
+                    const elem = $("RROW-" + id);
+                    if (elem) elem.removeClassName("Unread");
+                    catchup_id_batch.remove(id);
+                });
+            }
 
-                       }
+            updateFloatingTitle(true);
                });
        }
 }
@@ -1285,9 +1170,9 @@ function catchupRelativeToArticle(below, id) {
                return;
        }
 
-       var visible_ids = getLoadedArticleIds();
+       const visible_ids = getLoadedArticleIds();
 
-       var ids_to_mark = new Array();
+       const ids_to_mark = [];
 
        if (!below) {
                for (var i = 0; i < visible_ids.length; i++) {
@@ -1318,7 +1203,7 @@ function catchupRelativeToArticle(below, id) {
        if (ids_to_mark.length == 0) {
                alert(__("No articles found to mark"));
        } else {
-               var msg = ngettext("Mark %d article as read?", "Mark %d articles as read?", ids_to_mark.length).replace("%d", ids_to_mark.length);
+               const 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)) {
 
@@ -1327,137 +1212,28 @@ function catchupRelativeToArticle(below, id) {
                                e.removeClassName("Unread");
                        }
 
-                       var query = "?op=rpc&method=catchupSelected" +
-                               "&cmode=0" + "&ids=" + param_escape(ids_to_mark.toString());
+                       const query = { op: "rpc", method: "catchupSelected",
+                               cmode: 0, ids: ids_to_mark.toString() };
 
-                       new Ajax.Request("backend.php", {
-                               parameters: query,
-                               onComplete: function (transport) {
-                                       handle_rpc_json(transport);
-                               }
+                       xhrPost("backend.php", query, (transport) => {
+                handle_rpc_json(transport);
                        });
-
-               }
-       }
-}
-
-function cdmCollapseArticle(event, id, unmark) {
-       if (unmark == undefined) unmark = true;
-
-       var row = $("RROW-" + id);
-       var elem = $("CICD-" + id);
-
-       if (elem && row) {
-               var collapse = row.select("span[class='collapseBtn']")[0];
-
-               Element.hide(elem);
-               Element.show("CEXC-" + id);
-               Element.hide(collapse);
-
-               if (unmark) {
-                       row.removeClassName("active");
-
-                       markHeadline(id, false);
-
-                       if (id == getActiveArticleId()) {
-                               setActiveArticleId(0);
-                       }
-
-                       updateSelectedPrompt();
                }
-
-               if (event) Event.stop(event);
-
-               PluginHost.run(PluginHost.HOOK_ARTICLE_COLLAPSED, id);
-
-               if (row.offsetTop < $("headlines-frame").scrollTop)
-                       scrollToRowId(row.id);
-
-               $("floatingTitle").style.visibility = "hidden";
-               $("floatingTitle").setAttribute("data-article-id", 0);
        }
 }
 
-function cdmExpandArticle(id, noexpand) {
-       console.log("cdmExpandArticle " + id);
-
-       var row = $("RROW-" + id);
-
-       if (!row) return false;
-
-       var oldrow = $("RROW-" + getActiveArticleId());
-
-       var elem = $("CICD-" + getActiveArticleId());
-
-       if (id == getActiveArticleId() && Element.visible(elem))
-               return true;
-
-       selectArticles("none");
-
-       var old_offset = row.offsetTop;
-
-       if (getActiveArticleId() && elem && !getInitParam("cdm_expanded")) {
-               var collapse = oldrow.select("span[class='collapseBtn']")[0];
-
-               Element.hide(elem);
-               Element.show("CEXC-" + getActiveArticleId());
-               Element.hide(collapse);
-       }
-
-       if (oldrow) oldrow.removeClassName("active");
-
-       setActiveArticleId(id);
-
-       elem = $("CICD-" + id);
-
-       var collapse = row.select("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 = row.offsetTop;
-
-       if (old_offset > new_offset)
-               $("headlines-frame").scrollTop -= (old_offset - new_offset);
-
-       if (!noexpand) {
-               if (catchup_id_batch.indexOf(id) == -1)
-                       catchup_id_batch.push(id);
-
-               catchupCurrentBatchIfNeeded();
-       }
-
-       toggleSelected(id);
-       row.addClassName("active");
-
-       PluginHost.run(PluginHost.HOOK_ARTICLE_EXPANDED, id);
-
-       return false;
-}
-
 function getArticleUnderPointer() {
        return post_under_pointer;
 }
 
 function scrollArticle(offset) {
        if (!isCdmMode()) {
-               var ci = $("content-insert");
+               const ci = $("content-insert");
                if (ci) {
                        ci.scrollTop += offset;
                }
        } else {
-               var hi = $("headlines-frame");
+               const hi = $("headlines-frame");
                if (hi) {
                        hi.scrollTop += offset;
                }
@@ -1466,7 +1242,7 @@ function scrollArticle(offset) {
 }
 
 function show_labels_in_headlines(transport) {
-       var data = JSON.parse(transport.responseText);
+       const data = JSON.parse(transport.responseText);
 
        if (data) {
                data['info-for-headlines'].each(function (elem) {
@@ -1482,49 +1258,43 @@ function cdmClicked(event, id, in_body) {
 
        if (!event.ctrlKey && !event.metaKey) {
 
-               if (!getInitParam("cdm_expanded")) {
-                       return cdmExpandArticle(id);
-               } else {
-
-                       var elem = $("RROW-" + getActiveArticleId());
+               let elem = $("RROW-" + getActiveArticleId());
 
-                       if (elem) elem.removeClassName("active");
+               if (elem) elem.removeClassName("active");
 
-                       selectArticles("none");
-                       toggleSelected(id);
+               selectArticles("none");
+               toggleSelected(id);
 
-                       var elem = $("RROW-" + id);
-                       var article_is_unread = elem.hasClassName("Unread");
+               elem = $("RROW-" + id);
+               const article_is_unread = elem.hasClassName("Unread");
 
-                       elem.removeClassName("Unread");
-                       elem.addClassName("active");
+               elem.removeClassName("Unread");
+               elem.addClassName("active");
 
-                       setActiveArticleId(id);
+               setActiveArticleId(id);
 
-                       if (article_is_unread) {
-                               decrementFeedCounter(getActiveFeedId(), activeFeedIsCat());
-                               updateFloatingTitle(true);
-                       }
+               if (article_is_unread) {
+                       decrementFeedCounter(getActiveFeedId(), activeFeedIsCat());
+                       updateFloatingTitle(true);
 
-                       var query = "?op=rpc&method=catchupSelected" +
-                               "&cmode=0&ids=" + param_escape(id);
+                       const query = {
+                               op: "rpc", method: "catchupSelected",
+                               cmode: 0, ids: id
+                       };
 
-                       new Ajax.Request("backend.php", {
-                               parameters: query,
-                               onComplete: function (transport) {
-                                       handle_rpc_json(transport);
-                               }
+                       xhrPost("backend.php", query, (transport) => {
+                               handle_rpc_json(transport);
                        });
-
-                       return !event.shiftKey;
                }
 
+               return !event.shiftKey;
+
        } else if (!in_body) {
 
                toggleSelected(id, true);
 
-               var elem = $("RROW-" + id);
-               var article_is_unread = elem.hasClassName("Unread");
+               let elem = $("RROW-" + id);
+               const article_is_unread = elem.hasClassName("Unread");
 
                if (article_is_unread) {
                        decrementFeedCounter(getActiveFeedId(), activeFeedIsCat());
@@ -1537,7 +1307,7 @@ function cdmClicked(event, id, in_body) {
                return true;
        }
 
-       var unread_in_buffer = $$("#headlines-frame > div[id*=RROW][class*=Unread]").length
+       const unread_in_buffer = $$("#headlines-frame > div[id*=RROW][class*=Unread]").length
        request_counters(unread_in_buffer == 0);
 
        return false;
@@ -1548,8 +1318,6 @@ function hlClicked(event, id) {
                view(id);
                return true;
        } else if (event.ctrlKey || event.metaKey) {
-               toggleSelected(id, true);
-               toggleUnread(id, 0, false);
                openArticleInNewWindow(id);
                return false;
        } else {
@@ -1561,7 +1329,7 @@ function hlClicked(event, id) {
 function openArticleInNewWindow(id) {
        toggleUnread(id, 0, false);
 
-       var w = window.open("");
+       const w = window.open("");
        w.opener = null;
        w.location = "backend.php?op=article&method=redirect&id=" + id;
 }
@@ -1573,9 +1341,9 @@ function isCdmMode() {
 function markHeadline(id, marked) {
        if (marked == undefined) marked = true;
 
-       var row = $("RROW-" + id);
+       const row = $("RROW-" + id);
        if (row) {
-               var check = dijit.getEnclosingWidget(
+               const check = dijit.getEnclosingWidget(
                                row.getElementsByClassName("rchk")[0]);
 
                if (check) {
@@ -1591,15 +1359,15 @@ function markHeadline(id, marked) {
 
 function getRelativePostIds(id, limit) {
 
-       var tmp = [];
+       const tmp = [];
 
        if (!limit) limit = 6; //3
 
-       var ids = getLoadedArticleIds();
+       const ids = getLoadedArticleIds();
 
-       for (var i = 0; i < ids.length; i++) {
+       for (let i = 0; i < ids.length; i++) {
                if (ids[i] == id) {
-                       for (var k = 1; k <= limit; k++) {
+                       for (let k = 1; k <= limit; k++) {
                                //if (i > k-1) tmp.push(ids[i-k]);
                                if (i < ids.length - k) tmp.push(ids[i + k]);
                        }
@@ -1612,15 +1380,15 @@ function getRelativePostIds(id, limit) {
 
 function correctHeadlinesOffset(id) {
 
-       var container = $("headlines-frame");
-       var row = $("RROW-" + id);
+       const container = $("headlines-frame");
+       const row = $("RROW-" + id);
 
        if (!container || !row) return;
 
-       var viewport = container.offsetHeight;
+       const viewport = container.offsetHeight;
 
-       var rel_offset_top = row.offsetTop - container.scrollTop;
-       var rel_offset_bottom = row.offsetTop + row.offsetHeight - container.scrollTop;
+       const rel_offset_top = row.offsetTop - container.scrollTop;
+       const rel_offset_bottom = row.offsetTop + row.offsetHeight - container.scrollTop;
 
        //console.log("Rtop: " + rel_offset_top + " Rbtm: " + rel_offset_bottom);
        //console.log("Vport: " + viewport);
@@ -1651,7 +1419,7 @@ function closeArticlePanel() {
 function initFloatingMenu() {
        if (!dijit.byId("floatingMenu")) {
 
-               var menu = new dijit.Menu({
+               const menu = new dijit.Menu({
                        id: "floatingMenu",
                        targetNodeIds: ["floatingTitle"]
                });
@@ -1682,12 +1450,12 @@ function headlinesMenuCommon(menu) {
 
        menu.addChild(new dijit.MenuItem({
                label: __("Toggle unread"),
-               onClick: function (event) {
+               onClick: function () {
 
-                       var ids = getSelectedArticleIds2();
+                       let ids = getSelectedArticleIds2();
                        // cast to string
-                       var id = (this.getParent().currentTarget.getAttribute("data-article-id")) + "";
-                       ids = ids.size() != 0 && ids.indexOf(id) != -1 ? ids : [id];
+                       const id = (this.getParent().currentTarget.getAttribute("data-article-id")) + "";
+                       ids = ids.length != 0 && ids.indexOf(id) != -1 ? ids : [id];
 
                        selectionToggleUnread(undefined, false, true, ids);
                }
@@ -1695,11 +1463,11 @@ function headlinesMenuCommon(menu) {
 
        menu.addChild(new dijit.MenuItem({
                label: __("Toggle starred"),
-               onClick: function (event) {
-                       var ids = getSelectedArticleIds2();
+               onClick: function () {
+                       let ids = getSelectedArticleIds2();
                        // cast to string
-                       var id = (this.getParent().currentTarget.getAttribute("data-article-id")) + "";
-                       ids = ids.size() != 0 && ids.indexOf(id) != -1 ? ids : [id];
+                       const id = (this.getParent().currentTarget.getAttribute("data-article-id")) + "";
+                       ids = ids.length != 0 && ids.indexOf(id) != -1 ? ids : [id];
 
                        selectionToggleMarked(undefined, false, true, ids);
                }
@@ -1707,11 +1475,11 @@ function headlinesMenuCommon(menu) {
 
        menu.addChild(new dijit.MenuItem({
                label: __("Toggle published"),
-               onClick: function (event) {
-                       var ids = getSelectedArticleIds2();
+               onClick: function () {
+                       let ids = getSelectedArticleIds2();
                        // cast to string
-                       var id = (this.getParent().currentTarget.getAttribute("data-article-id")) + "";
-                       ids = ids.size() != 0 && ids.indexOf(id) != -1 ? ids : [id];
+                       const id = (this.getParent().currentTarget.getAttribute("data-article-id")) + "";
+                       ids = ids.length != 0 && ids.indexOf(id) != -1 ? ids : [id];
 
                        selectionTogglePublished(undefined, false, true, ids);
                }
@@ -1721,42 +1489,42 @@ function headlinesMenuCommon(menu) {
 
        menu.addChild(new dijit.MenuItem({
                label: __("Mark above as read"),
-               onClick: function (event) {
+               onClick: function () {
                        catchupRelativeToArticle(0, this.getParent().currentTarget.getAttribute("data-article-id"));
                }
        }));
 
        menu.addChild(new dijit.MenuItem({
                label: __("Mark below as read"),
-               onClick: function (event) {
+               onClick: function () {
                        catchupRelativeToArticle(1, this.getParent().currentTarget.getAttribute("data-article-id"));
                }
        }));
 
 
-       var labels = getInitParam("labels");
+       const labels = getInitParam("labels");
 
        if (labels && labels.length) {
 
                menu.addChild(new dijit.MenuSeparator());
 
-               var labelAddMenu = new dijit.Menu({ownerMenu: menu});
-               var labelDelMenu = new dijit.Menu({ownerMenu: menu});
+               const labelAddMenu = new dijit.Menu({ownerMenu: menu});
+               const labelDelMenu = new dijit.Menu({ownerMenu: menu});
 
                labels.each(function (label) {
-                       var bare_id = label.id;
-                       var name = label.caption;
+                       const bare_id = label.id;
+                       const name = label.caption;
 
                        labelAddMenu.addChild(new dijit.MenuItem({
                                label: name,
                                labelId: bare_id,
-                               onClick: function (event) {
+                               onClick: function () {
 
-                                       var ids = getSelectedArticleIds2();
+                                       let ids = getSelectedArticleIds2();
                                        // cast to string
-                                       var id = (this.getParent().ownerMenu.currentTarget.getAttribute("data-article-id")) + "";
+                                       const id = (this.getParent().ownerMenu.currentTarget.getAttribute("data-article-id")) + "";
 
-                                       ids = ids.size() != 0 && ids.indexOf(id) != -1 ? ids : [id];
+                                       ids = ids.length != 0 && ids.indexOf(id) != -1 ? ids : [id];
 
                                        selectionAssignLabel(this.labelId, ids);
                                }
@@ -1765,12 +1533,12 @@ function headlinesMenuCommon(menu) {
                        labelDelMenu.addChild(new dijit.MenuItem({
                                label: name,
                                labelId: bare_id,
-                               onClick: function (event) {
-                                       var ids = getSelectedArticleIds2();
+                               onClick: function () {
+                                       let ids = getSelectedArticleIds2();
                                        // cast to string
-                                       var id = (this.getParent().ownerMenu.currentTarget.getAttribute("data-article-id")) + "";
+                                       const id = (this.getParent().ownerMenu.currentTarget.getAttribute("data-article-id")) + "";
 
-                                       ids = ids.size() != 0 && ids.indexOf(id) != -1 ? ids : [id];
+                                       ids = ids.length != 0 && ids.indexOf(id) != -1 ? ids : [id];
 
                                        selectionRemoveLabel(this.labelId, ids);
                                }
@@ -1794,7 +1562,7 @@ function headlinesMenuCommon(menu) {
 function initHeadlinesMenu() {
        if (!dijit.byId("headlinesMenu")) {
 
-               var menu = new dijit.Menu({
+               const menu = new dijit.Menu({
                        id: "headlinesMenu",
                        targetNodeIds: ["headlines-frame"],
                        selector: ".hlMenuAttach"
@@ -1809,7 +1577,7 @@ function initHeadlinesMenu() {
 
        if (!dijit.byId("headlinesFeedTitleMenu")) {
 
-               var menu = new dijit.Menu({
+               const menu = new dijit.Menu({
                        id: "headlinesFeedTitleMenu",
                        targetNodeIds: ["headlines-frame"],
                        selector: "div.cdmFeedTitle"
@@ -1827,7 +1595,7 @@ function initHeadlinesMenu() {
 
                menu.addChild(new dijit.MenuItem({
                        label: __("Mark group as read"),
-                       onClick: function (event) {
+                       onClick: function () {
                                selectArticles("none");
                                selectArticles("all",
                                        "#headlines-frame > div[id*=RROW]" +
@@ -1839,14 +1607,14 @@ function initHeadlinesMenu() {
 
                menu.addChild(new dijit.MenuItem({
                        label: __("Mark feed as read"),
-                       onClick: function (event) {
+                       onClick: function () {
                                catchupFeedInGroup(this.getParent().currentTarget.getAttribute("data-feed-id"));
                        }
                }));
 
                menu.addChild(new dijit.MenuItem({
                        label: __("Edit feed"),
-                       onClick: function (event) {
+                       onClick: function () {
                                editFeed(this.getParent().currentTarget.getAttribute("data-feed-id"));
                        }
                }));
@@ -1886,39 +1654,33 @@ function cancelSearch() {
 }
 
 function setSelectionScore() {
-       var ids = getSelectedArticleIds2();
+       const ids = getSelectedArticleIds2();
 
        if (ids.length > 0) {
                console.log(ids);
 
-               var score = prompt(__("Please enter new score for selected articles:"), score);
+               const score = prompt(__("Please enter new score for selected articles:"));
 
                if (score != undefined) {
-                       var query = "op=article&method=setScore&id=" + param_escape(ids.toString()) +
-                               "&score=" + param_escape(score);
-
-                       new Ajax.Request("backend.php", {
-                               parameters: query,
-                               onComplete: function (transport) {
-                                       var reply = JSON.parse(transport.responseText);
-                                       if (reply) {
-                                               console.log(ids);
-
-                                               ids.each(function (id) {
-                                                       var row = $("RROW-" + id);
-
-                                                       if (row) {
-                                                               var pic = row.getElementsByClassName("hlScorePic")[0];
-
-                                                               if (pic) {
-                                                                       pic.src = pic.src.replace(/score_.*?\.png/,
-                                                                               reply["score_pic"]);
-                                                                       pic.setAttribute("score", score);
-                                                               }
-                                                       }
-                                               });
-                                       }
-                               }
+                       const query = { op: "article", method: "setScore", id: ids.toString(),
+                               score: score };
+
+                       xhrJson("backend.php", query, (reply) => {
+                               if (reply) {
+                    reply.id.each((id) => {
+                        const row = $("RROW-" + id);
+
+                        if (row) {
+                            const pic = row.getElementsByClassName("hlScorePic")[0];
+
+                            if (pic) {
+                                pic.src = pic.src.replace(/score_.*?\.png/,
+                                    reply["score_pic"]);
+                                pic.setAttribute("score", reply["score"]);
+                            }
+                        }
+                    });
+                }
                        });
                }
 
@@ -1927,19 +1689,20 @@ function setSelectionScore() {
        }
 }
 
+/*
 function updateScore(id) {
-       var pic = $$("#RROW-" + id + " .hlScorePic")[0];
+       const pic = $$("#RROW-" + id + " .hlScorePic")[0];
 
        if (pic) {
 
-               var query = "op=article&method=getScore&id=" + param_escape(id);
+               const query = "op=article&method=getScore&id=" + param_escape(id);
 
                new Ajax.Request("backend.php", {
                        parameters: query,
                        onComplete: function (transport) {
                                console.log(transport.responseText);
 
-                               var reply = JSON.parse(transport.responseText);
+                               const reply = JSON.parse(transport.responseText);
 
                                if (reply) {
                                        pic.src = pic.src.replace(/score_.*?\.png/, reply["score_pic"]);
@@ -1949,50 +1712,39 @@ function updateScore(id) {
                        }
                });
        }
-}
+} */
 
 function changeScore(id, pic) {
-       var score = pic.getAttribute("score");
+       const score = pic.getAttribute("score");
 
-       var new_score = prompt(__("Please enter new score for this article:"), score);
+       const new_score = prompt(__("Please enter new score for this article:"), score);
 
        if (new_score != undefined) {
-
-               var query = "op=article&method=setScore&id=" + param_escape(id) +
-                       "&score=" + param_escape(new_score);
-
-               new Ajax.Request("backend.php", {
-                       parameters: query,
-                       onComplete: function (transport) {
-                               var reply = JSON.parse(transport.responseText);
-
-                               if (reply) {
-                                       pic.src = pic.src.replace(/score_.*?\.png/, reply["score_pic"]);
-                                       pic.setAttribute("score", new_score);
-                                       pic.setAttribute("title", new_score);
-                               }
-                       }
+               const query = { op: "article", method: "setScore", id: id, score: new_score };
+
+               xhrJson("backend.php", query, (reply) => {
+            if (reply) {
+                pic.src = pic.src.replace(/score_.*?\.png/, reply["score_pic"]);
+                pic.setAttribute("score", new_score);
+                pic.setAttribute("title", new_score);
+            }
                });
        }
 }
 
 function displayArticleUrl(id) {
-       var query = "op=rpc&method=getlinktitlebyid&id=" + param_escape(id);
+       const query = { op: "rpc", method: "getlinktitlebyid", id: 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);
-                       }
-               }
+       xhrJson("backend.php", query, (reply) => {
+        if (reply && reply.link) {
+            prompt(__("Article URL:"), reply.link);
+        }
        });
+
 }
 
 function scrollToRowId(id) {
-       var row = $(id);
+       const row = $(id);
 
        if (row)
                $("headlines-frame").scrollTop = row.offsetTop - 4;
@@ -2001,17 +1753,17 @@ function scrollToRowId(id) {
 function updateFloatingTitle(unread_only) {
        if (!isCdmMode()) return;
 
-       var hf = $("headlines-frame");
+       const hf = $("headlines-frame");
 
-       var elems = $$("#headlines-frame > div[id*=RROW]");
+       const elems = $$("#headlines-frame > div[id*=RROW]");
 
-       for (var i = 0; i < elems.length; i++) {
+       for (let i = 0; i < elems.length; i++) {
 
-               var child = elems[i];
+               const child = elems[i];
 
                if (child && child.offsetTop + child.offsetHeight > hf.scrollTop) {
 
-                       var header = child.getElementsByClassName("cdmHeader")[0];
+                       const header = child.getElementsByClassName("cdmHeader")[0];
 
                        if (unread_only || child.getAttribute("data-article-id") != $("floatingTitle").getAttribute("data-article-id")) {
                                if (child.getAttribute("data-article-id") != $("floatingTitle").getAttribute("data-article-id")) {
@@ -2022,7 +1774,7 @@ function updateFloatingTitle(unread_only) {
 
                                        initFloatingMenu();
 
-                                       var cb = $$("#floatingTitle .dijitCheckBox")[0];
+                                       const cb = $$("#floatingTitle .dijitCheckBox")[0];
 
                                        if (cb)
                                                cb.parentNode.removeChild(cb);
@@ -2048,18 +1800,3 @@ function updateFloatingTitle(unread_only) {
                }
        }
 }
-
-function catchupCurrentBatchIfNeeded() {
-       if (catchup_id_batch.length > 0) {
-               window.clearTimeout(catchup_timeout_id);
-               catchup_timeout_id = window.setTimeout(catchupBatchedArticles, 1000);
-
-               if (catchup_id_batch.length >= 10) {
-                       catchupBatchedArticles();
-               }
-       }
-}
-
-function cdmFooterClick(event) {
-       event.stopPropagation();
-}