]> git.wh0rd.org - tt-rss.git/blobdiff - js/viewfeed.js
scroll handler: performance improvements
[tt-rss.git] / js / viewfeed.js
index 0b37c071fa967df1af88ec35737e400421fb72f0..6ae9cdd8a503fe42cd51c65775de293d81e41d2c 100755 (executable)
-var article_cache = new Array();
+/* global dijit, __ */
 
-var _active_article_id = 0;
+let _active_article_id = 0;
 
-var vgroup_last_feed = false;
-var post_under_pointer = false;
+let vgroup_last_feed = false;
+let post_under_pointer = false;
 
-var last_requested_article = false;
+let last_requested_article = 0;
 
-var catchup_id_batch = [];
-var catchup_timeout_id = false;
+let catchup_id_batch = [];
+let catchup_timeout_id = false;
 
-var cids_requested = [];
-var loaded_article_ids = [];
-var _last_headlines_update = 0;
-var current_first_id = 0;
+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 _catchup_request_sent = false;
+let _catchup_request_sent = false;
 
-var has_storage = 'sessionStorage' in window && window['sessionStorage'] !== null;
+let has_storage = 'sessionStorage' in window && window['sessionStorage'] !== null;
 
 function headlines_callback2(transport, offset, background, infscroll_req) {
-       try {
-               handle_rpc_json(transport);
+       const reply = handle_rpc_json(transport);
 
-               console.log("headlines_callback2 [offset=" + offset + "] B:" + background + " I:" + infscroll_req);
+       console.log("headlines_callback2 [offset=" + offset + "] B:" + background + " I:" + infscroll_req);
 
-               var is_cat = false;
-               var feed_id = false;
+       if (background)
+               return;
 
-               var reply = false;
+       var is_cat = false;
+       var feed_id = false;
 
-               try {
-                       reply = JSON.parse(transport.responseText);
-               } catch (e) {
-                       console.error(e);
-               }
+       if (reply) {
 
-               if (reply) {
+               is_cat = reply['headlines']['is_cat'];
+               feed_id = reply['headlines']['id'];
+               last_search_query = reply['headlines']['search_query'];
 
-                       is_cat = reply['headlines']['is_cat'];
-                       feed_id = reply['headlines']['id'];
+               if (feed_id != -7 && (feed_id != getActiveFeedId() || is_cat != activeFeedIsCat()))
+                       return;
 
-                       if (background) {
-                               var content = reply['headlines']['content'];
+               try {
+                       if (infscroll_req == false) {
+                               $("headlines-frame").scrollTop = 0;
 
-                               content = content + "<div id='headlines-spacer'></div>";
-                               return;
+                               $("floatingTitle").style.visibility = "hidden";
+                               $("floatingTitle").setAttribute("data-article-id", 0);
+                               $("floatingTitle").innerHTML = "";
                        }
+               } catch (e) { }
 
-                       if (feed_id != -7 && (feed_id != getActiveFeedId() || is_cat != activeFeedIsCat()))
-                               return;
+               $("headlines-frame").removeClassName("cdm");
+               $("headlines-frame").removeClassName("normal");
 
-                       /* dijit.getEnclosingWidget(
-                               document.forms["main_toolbar_form"].update).attr('disabled',
-                                       is_cat || feed_id <= 0); */
+               $("headlines-frame").addClassName(isCdmMode() ? "cdm" : "normal");
 
-                       try {
-                               if (infscroll_req == false) {
-                                       $("headlines-frame").scrollTop = 0;
+               const headlines_count = reply['headlines-info']['count'];
 
-                                       $("floatingTitle").style.visibility = "hidden";
-                                       $("floatingTitle").setAttribute("rowid", 0);
-                                       $("floatingTitle").innerHTML = "";
-                               }
-                       } catch (e) { };
+               vgroup_last_feed = reply['headlines-info']['vgroup_last_feed'];
+
+               if (parseInt(headlines_count) < 30) {
+                       _infscroll_disable = 1;
+               } else {
+                       _infscroll_disable = 0;
+               }
+
+               current_first_id = reply['headlines']['first_id'];
+               const counters = reply['counters'];
+               const articles = reply['articles'];
 
-                       $("headlines-frame").removeClassName("cdm");
-                       $("headlines-frame").removeClassName("normal");
+               if (infscroll_req == false) {
+                       loaded_article_ids = [];
 
-                       $("headlines-frame").addClassName(isCdmMode() ? "cdm" : "normal");
+                       dojo.html.set($("headlines-toolbar"),
+                                       reply['headlines']['toolbar'],
+                                       {parseContent: true});
 
-                       var headlines_count = reply['headlines-info']['count'];
+                       $("headlines-frame").innerHTML = '';
 
-                       vgroup_last_feed = reply['headlines-info']['vgroup_last_feed'];
+                       let tmp = document.createElement("div");
+                       tmp.innerHTML = reply['headlines']['content'];
+                       dojo.parser.parse(tmp);
 
-                       if (parseInt(headlines_count) < 30) {
-                               _infscroll_disable = 1;
-                       } else {
-                               _infscroll_disable = 0;
+                       while (tmp.hasChildNodes()) {
+                               var row = tmp.removeChild(tmp.firstChild);
+
+                               if (loaded_article_ids.indexOf(row.id) == -1 || row.hasClassName("cdmFeedTitle")) {
+                                       dijit.byId("headlines-frame").domNode.appendChild(row);
+
+                                       loaded_article_ids.push(row.id);
+                               }
                        }
 
-                       current_first_id = reply['headlines']['first_id'];
-                       var counters = reply['counters'];
-                       var articles = reply['articles'];
-                       //var runtime_info = reply['runtime-info'];
+                       let hsp = $("headlines-spacer");
+                       if (!hsp) hsp = new Element("DIV", {"id": "headlines-spacer"});
+                       dijit.byId('headlines-frame').domNode.appendChild(hsp);
 
-                       if (infscroll_req == false) {
-                               loaded_article_ids = [];
+                       initHeadlinesMenu();
 
-                               dojo.html.set($("headlines-toolbar"),
-                                               reply['headlines']['toolbar'],
-                                               {parseContent: true});
+                       if (_infscroll_disable)
+                               hsp.innerHTML = "<a href='#' onclick='openNextUnreadFeed()'>" +
+                                       __("Click to open next unread feed.") + "</a>";
 
-                               /*dojo.html.set($("headlines-frame"),
-                                       reply['headlines']['content'],
-                                       {parseContent: true});
+                       if (_search_query) {
+                               $("feed_title").innerHTML += "<span id='cancel_search'>" +
+                                       " (<a href='#' onclick='cancelSearch()'>" + __("Cancel search") + "</a>)" +
+                                       "</span>";
+                       }
 
-                               $$("#headlines-frame div[id*='RROW']").each(function(row) {
-                                       loaded_article_ids.push(row.id);
-                               });*/
+               } else if (headlines_count > 0 && feed_id == getActiveFeedId() && is_cat == activeFeedIsCat()) {
+                               console.log("adding some more headlines: " + headlines_count);
 
-                               $("headlines-frame").innerHTML = '';
+                               const c = dijit.byId("headlines-frame");
+                               const ids = getSelectedArticleIds2();
 
-                               var tmp = new Element("div");
+                               let hsp = $("headlines-spacer");
+
+                               if (hsp)
+                                       c.domNode.removeChild(hsp);
+
+                               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);
@@ -116,835 +134,628 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
                                        }
                                }
 
-                               var hsp = $("headlines-spacer");
                                if (!hsp) hsp = new Element("DIV", {"id": "headlines-spacer"});
-                               dijit.byId('headlines-frame').domNode.appendChild(hsp);
+                               c.domNode.appendChild(hsp);
 
-                               initHeadlinesMenu();
+                               if (headlines_count < 30) _infscroll_disable = true;
 
-                               if (_infscroll_disable)
-                                       hsp.innerHTML = "<a href='#' onclick='openNextUnreadFeed()'>" +
-                                               __("Click to open next unread feed.") + "</a>";
+                               console.log("restore selected ids: " + ids);
 
-                               if (_search_query) {
-                                       $("feed_title").innerHTML += "<span id='cancel_search'>" +
-                                               " (<a href='#' onclick='cancelSearch()'>" + __("Cancel search") + "</a>)" +
-                                               "</span>";
+                               for (let i = 0; i < ids.length; i++) {
+                                       markHeadline(ids[i]);
                                }
 
-                       } 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();
-
-                                       var hsp = $("headlines-spacer");
-
-                                       if (hsp)
-                                               c.domNode.removeChild(hsp);
-
-                                       var tmp = new Element("div");
-                                       tmp.innerHTML = reply['headlines']['content'];
-                                       dojo.parser.parse(tmp);
-
-                                       while (tmp.hasChildNodes()) {
-                                               var row = tmp.removeChild(tmp.firstChild);
-
-                                               if (loaded_article_ids.indexOf(row.id) == -1 || row.hasClassName("cdmFeedTitle")) {
-                                                       dijit.byId("headlines-frame").domNode.appendChild(row);
-
-                                                       loaded_article_ids.push(row.id);
-                                               }
-                                       }
-
-                                       if (!hsp) hsp = new Element("DIV", {"id": "headlines-spacer"});
-                                       c.domNode.appendChild(hsp);
+                               initHeadlinesMenu();
 
-                                       if (headlines_count < 30) _infscroll_disable = true;
+                               if (_infscroll_disable) {
+                                       hsp.innerHTML = "<a href='#' onclick='openNextUnreadFeed()'>" +
+                                       __("Click to open next unread feed.") + "</a>";
+                               }
 
-                                       console.log("restore selected ids: " + ids);
+                       } else {
+                               console.log("no new headlines received");
 
-                                       for (var i = 0; i < ids.length; i++) {
-                                               markHeadline(ids[i]);
-                                       }
+                               const first_id_changed = reply['headlines']['first_id_changed'];
+                               console.log("first id changed:" + first_id_changed);
 
-                                       initHeadlinesMenu();
+                               let hsp = $("headlines-spacer");
 
-                                       if (_infscroll_disable) {
+                               if (hsp) {
+                                       if (first_id_changed) {
+                                               hsp.innerHTML = "<a href='#' onclick='viewCurrentFeed()'>" +
+                                               __("New articles found, reload feed to continue.") + "</a>";
+                                       } else {
                                                hsp.innerHTML = "<a href='#' onclick='openNextUnreadFeed()'>" +
                                                __("Click to open next unread feed.") + "</a>";
                                        }
 
-                               } else {
-                                       console.log("no new headlines received");
-
-                                       var first_id_changed = reply['headlines']['first_id_changed'];
-                                       console.log("first id changed:" + first_id_changed);
-
-                                       var hsp = $("headlines-spacer");
-
-                                       if (hsp) {
-                                               if (first_id_changed) {
-                                                       hsp.innerHTML = "<a href='#' onclick='viewCurrentFeed()'>" +
-                                                       __("New articles found, reload feed to continue.") + "</a>";
-                                               } else {
-                                                       hsp.innerHTML = "<a href='#' onclick='openNextUnreadFeed()'>" +
-                                                       __("Click to open next unread feed.") + "</a>";
-                                               }
-
-                                       }
-
                                }
-                       }
 
-                       if (articles) {
-                               for (var i = 0; i < articles.length; i++) {
-                                       var a_id = articles[i]['id'];
-                                       cache_set("article:" + a_id, articles[i]['content']);
-                               }
-                       } else {
-                               console.log("no cached articles received");
                        }
 
-                       if (counters)
-                               parse_counters(counters);
-                       else
-                               request_counters(true);
-
+               if (articles) {
+                       for (let i = 0; i < articles.length; i++) {
+                               const a_id = articles[i]['id'];
+                               cache_set("article:" + a_id, articles[i]['content']);
+                       }
                } else {
-                       console.error("Invalid object received: " + transport.responseText);
-                       dijit.byId("headlines-frame").attr('content', "<div class='whiteBox'>" +
-                                       __('Could not update headlines (invalid object received - see error console for details)') +
-                                       "</div>");
+                       console.log("no cached articles received");
                }
 
-               _infscroll_request_sent = 0;
-               _last_headlines_update = new Date().getTime();
+               if (counters)
+                       parse_counters(counters);
+               else
+                       request_counters();
 
-               unpackVisibleHeadlines();
+       } else {
+               console.error("Invalid object received: " + transport.responseText);
+               dijit.byId("headlines-frame").attr('content', "<div class='whiteBox'>" +
+                               __('Could not update headlines (invalid object received - see error console for details)') +
+                               "</div>");
+       }
 
-               // if we have some more space in the buffer, why not try to fill it
+       _infscroll_request_sent = 0;
+       _last_headlines_update = new Date().getTime();
 
-               if (!_infscroll_disable && $("headlines-spacer") &&
-                               $("headlines-spacer").offsetTop < $("headlines-frame").offsetHeight) {
+       unpackVisibleHeadlines();
 
-                       window.setTimeout(function() {
-                               loadMoreHeadlines();
-                       }, 250);
-               }
+       // if we have some more space in the buffer, why not try to fill it
 
-               notify("");
+       if (!_infscroll_disable && $("headlines-spacer") &&
+                       $("headlines-spacer").offsetTop < $("headlines-frame").offsetHeight) {
 
-       } catch (e) {
-               exception_error("headlines_callback2", e, transport);
+               window.setTimeout(function() {
+                       loadMoreHeadlines();
+               }, 250);
        }
+
+       notify("");
 }
 
 function render_article(article) {
-       try {
-               cleanup_memory("content-insert");
+       cleanup_memory("content-insert");
 
-               dijit.byId("headlines-wrap-inner").addChild(
-                               dijit.byId("content-insert"));
-
-               var c = dijit.byId("content-insert");
+       dijit.byId("headlines-wrap-inner").addChild(
+                       dijit.byId("content-insert"));
 
-               try {
-                       c.domNode.scrollTop = 0;
-               } catch (e) { };
+       const c = dijit.byId("content-insert");
 
-               c.attr('content', article);
-               PluginHost.run(PluginHost.HOOK_ARTICLE_RENDERED, c.domNode);
+       try {
+               c.domNode.scrollTop = 0;
+       } catch (e) { }
 
-               correctHeadlinesOffset(getActiveArticleId());
+       c.attr('content', article);
+       PluginHost.run(PluginHost.HOOK_ARTICLE_RENDERED, c.domNode);
 
-               try {
-                       c.focus();
-               } catch (e) { };
+       correctHeadlinesOffset(getActiveArticleId());
 
-       } catch (e) {
-               exception_error("render_article", e);
-       }
+       try {
+               c.focus();
+       } catch (e) { }
 }
 
 function showArticleInHeadlines(id, noexpand) {
+       const row = $("RROW-" + id);
+       if (!row) return;
 
-       try {
-               selectArticles("none");
-
-               var crow = $("RROW-" + id);
-
-               if (!crow) return;
+       if (!noexpand)
+               row.removeClassName("Unread");
 
-               var article_is_unread = crow.hasClassName("Unread");
+       row.addClassName("active");
 
-               if (!noexpand)
-                       crow.removeClassName("Unread");
-               crow.addClassName("active");
+       selectArticles('none');
 
-               selectArticles('none');
-
-               var view_mode = false;
-
-               try {
-                       view_mode = document.forms['main_toolbar_form'].view_mode;
-                       view_mode = view_mode[view_mode.selectedIndex].value;
-               } catch (e) {
-                       //
-               }
-
-               markHeadline(id);
-
-               if (article_is_unread && !noexpand)
-                       _force_scheduled_update = true;
-
-       } catch (e) {
-               exception_error("showArticleInHeadlines", e);
-       }
+       markHeadline(id);
 }
 
 function article_callback2(transport, id) {
-       try {
-               console.log("article_callback2 " + id);
-
-               handle_rpc_json(transport);
+       console.log("article_callback2 " + id);
 
-               var reply = false;
-
-               try {
-                       reply = JSON.parse(transport.responseText);
-               } catch (e) {
-                       console.error(e);
-               }
+       const reply = handle_rpc_json(transport);
 
-               if (reply) {
+       if (reply) {
 
-                       reply.each(function(article) {
-                               if (getActiveArticleId() == article['id']) {
-                                       render_article(article['content']);
-                               }
-                               cids_requested.remove(article['id']);
-
-                               cache_set("article:" + article['id'], article['content']);
-                       });
+               reply.each(function(article) {
+                       if (getActiveArticleId() == article['id']) {
+                               render_article(article['content']);
+                       }
+                       cids_requested.remove(article['id']);
 
-//                     if (id != last_requested_article) {
-//                             console.log("requested article id is out of sequence, aborting");
-//                             return;
-//                     }
+                       cache_set("article:" + article['id'], article['content']);
+               });
 
-               } else {
-                       console.error("Invalid object received: " + transport.responseText);
+       } else {
+               console.error("Invalid object received: " + transport.responseText);
 
-                       render_article("<div class='whiteBox'>" +
-                                       __('Could not display article (invalid object received - see error console for details)') + "</div>");
-               }
+               render_article("<div class='whiteBox'>" +
+                               __('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
-               request_counters(unread_in_buffer == 0);
+       const unread_in_buffer = $$("#headlines-frame > div[id*=RROW][class*=Unread]").length;
+       request_counters(unread_in_buffer == 0);
 
-               notify("");
-       } catch (e) {
-               exception_error("article_callback2", e, transport);
-       }
+       notify("");
 }
 
 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);
+       const oldrow = $("RROW-" + getActiveArticleId());
+       if (oldrow) oldrow.removeClassName("active");
 
-               var cached_article = cache_get("article:" + id);
+       const crow = $("RROW-" + id);
 
-               console.log("cache check result: " + (cached_article != false));
-
-               var query = "?op=article&method=view&id=" + param_escape(id);
+       if (!crow) return;
+       if (noexpand) {
+               setActiveArticleId(id);
+               showArticleInHeadlines(id, noexpand);
+               return;
+       }
 
-               var neighbor_ids = getRelativePostIds(id);
+       console.log("loading article: " + id);
 
-               /* only request uncached articles */
+       const cached_article = cache_get("article:" + id);
 
-               var cids_to_request = [];
+       console.log("cache check result: " + (cached_article != false));
 
-               for (var 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]);
-                                       cids_requested.push(neighbor_ids[i]);
-                               }
-               }
+       const query = {op: "article", method: "view", id: id};
 
-               console.log("additional ids: " + cids_to_request.toString());
+       const neighbor_ids = getRelativePostIds(id);
 
-               query = query + "&cids=" + cids_to_request.toString();
+       /* only request uncached articles */
 
-               var article_is_unread = crow.hasClassName("Unread");
+       const cids_to_request = [];
 
-               setActiveArticleId(id);
-               showArticleInHeadlines(id);
+       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]);
+                               cids_requested.push(neighbor_ids[i]);
+                       }
+       }
 
-               if (cached_article && article_is_unread) {
+       console.log("additional ids: " + cids_to_request.toString());
 
-                       query = query + "&mode=prefetch";
+       query.cids = cids_to_request.toString();
 
-                       render_article(cached_article);
+       const article_is_unread = crow.hasClassName("Unread");
 
-               } else if (cached_article) {
+       setActiveArticleId(id);
+       showArticleInHeadlines(id);
 
-                       query = query + "&mode=prefetch_old";
-                       render_article(cached_article);
+       if (cached_article && article_is_unread) {
+               query.mode = "prefetch";
+               render_article(cached_article);
+       } else if (cached_article) {
+        query.mode = "prefetch_old";
+               render_article(cached_article);
 
-                       // if we don't need to request any relative ids, we might as well skip
-                       // the server roundtrip altogether
-                       if (cids_to_request.length == 0) {
-                               return;
-                       }
+               // if we don't need to request any relative ids, we might as well skip
+               // the server roundtrip altogether
+               if (cids_to_request.length == 0) {
+                       return;
                }
+       }
 
-               last_requested_article = id;
+       last_requested_article = id;
 
-               console.log(query);
+       console.log(query);
 
-               if (article_is_unread) {
-                       decrementFeedCounter(getActiveFeedId(), activeFeedIsCat());
-               }
+       if (article_is_unread) {
+               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;
+       return false;
 
-       } catch (e) {
-               exception_error("view", e);
-       }
 }
 
 function toggleMark(id, client_only) {
-       try {
-               var query = "?op=rpc&id=" + id + "&method=mark";
+       const query = { op: "rpc", id: id, method: "mark" };
 
-               var row = $("RROW-" + id);
-               if (!row) return;
+       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++)
-                       imgs.push(row_imgs[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("rowid") == "RROW-" + id) {
-                       var fte = ft.getElementsByClassName("markedPic");
+       if (ft && ft.getAttribute("data-article-id") == id) {
+               const fte = ft.getElementsByClassName("markedPic");
 
-                       for (var i = 0; i < fte.length; i++)
-                               imgs.push(fte[i]);
-               }
+               for (var i = 0; i < fte.length; i++)
+                       imgs.push(fte[i]);
+       }
 
-               for (i = 0; i < imgs.length; i++) {
-                       var img = imgs[i];
+       for (i = 0; i < imgs.length; i++) {
+               const img = imgs[i];
 
-                       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";
-                       }
+               if (!row.hasClassName("marked")) {
+                       img.src = img.src.replace("mark_unset", "mark_set");
+                       query.mark = 1;
+               } else {
+                       img.src = img.src.replace("mark_set", "mark_unset");
+                       query.mark = 0;
                }
+       }
 
-               row.toggleClassName("marked");
-
-               if (!client_only) {
-                       new Ajax.Request("backend.php", {
-                               parameters: query,
-                               onComplete: function(transport) {
-                                       handle_rpc_json(transport);
-                               } });
-               }
+       row.toggleClassName("marked");
 
-       } catch (e) {
-               exception_error("toggleMark", e);
+       if (!client_only)
+               xhrPost("backend.php", query, (transport) => {
+                       handle_rpc_json(transport);
+               });
        }
-}
 
 function togglePub(id, client_only, no_effects, note) {
-       try {
-               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);
-               } else {
-                       query = query + "&note=undefined";
-               }
+       if (note != undefined) {
+               query.note = note;
+       } else {
+               query.note = "undefined";
+       }
 
-               var row = $("RROW-" + id);
-               if (!row) return;
+       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++)
-                       imgs.push(row_imgs[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("rowid") == "RROW-" + id) {
-                       var fte = ft.getElementsByClassName("pubPic");
+       if (ft && ft.getAttribute("data-article-id") == id) {
+               const fte = ft.getElementsByClassName("pubPic");
 
-                       for (var i = 0; i < fte.length; i++)
-                               imgs.push(fte[i]);
-               }
+               for (let i = 0; i < fte.length; i++)
+                       imgs.push(fte[i]);
+       }
 
-               for (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");
-                               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";
-                       }
+               if (!row.hasClassName("published") || note != undefined) {
+                       img.src = img.src.replace("pub_unset", "pub_set");
+                       query.pub = 1;
+               } else {
+                       img.src = img.src.replace("pub_set", "pub_unset");
+                       query.pub = 0;
                }
+       }
 
-               if (note != undefined)
-                       row.addClassName("published");
-               else
-                       row.toggleClassName("published");
+       if (note != undefined)
+               row.addClassName("published");
+       else
+               row.toggleClassName("published");
 
-               if (!client_only) {
-                       new Ajax.Request("backend.php", {
-                               parameters: query,
-                               onComplete: function(transport) {
-                                       handle_rpc_json(transport);
-                               } });
-               }
-
-       } catch (e) {
-               exception_error("togglePub", e);
-       }
+       if (!client_only)
+               xhrPost("backend.php", query, (transport) => {
+                               handle_rpc_json(transport);
+               });
 }
 
 function moveToPost(mode, noscroll, noexpand) {
+       const rows = getLoadedArticleIds();
 
-       try {
-
-               var rows = getLoadedArticleIds();
+       let prev_id = false;
+       let next_id = false;
 
-               var prev_id = false;
-               var next_id = false;
-
-               if (!$('RROW-' + getActiveArticleId())) {
-                       setActiveArticleId(0);
-               }
+       if (!$('RROW-' + getActiveArticleId())) {
+               setActiveArticleId(0);
+       }
 
-               if (!getActiveArticleId()) {
-                       next_id = rows[0];
-                       prev_id = rows[rows.length-1]
-               } else {
-                       for (var i = 0; i < rows.length; i++) {
-                               if (rows[i] == getActiveArticleId()) {
+       if (!getActiveArticleId()) {
+               next_id = rows[0];
+               prev_id = rows[rows.length-1]
+       } else {
+               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];
+                               // 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] != getActiveArticleId()) {
-                                                       next_id = rows[j];
-                                                       break;
-                                               }
+                               for (let j = i+1; j < rows.length; j++) {
+                                       if (rows[j] != getActiveArticleId()) {
+                                               next_id = rows[j];
+                                               break;
                                        }
-                                       break;
                                }
+                               break;
                        }
                }
+       }
 
-               console.log("cur: " + getActiveArticleId() + " next: " + next_id);
+       console.log("cur: " + getActiveArticleId() + " next: " + next_id);
 
-               if (mode == "next") {
-                       if (next_id || getActiveArticleId()) {
-                               if (isCdmMode()) {
+       if (mode == "next") {
+               if (next_id || getActiveArticleId()) {
+                       if (isCdmMode()) {
 
-                                       var article = $("RROW-" + getActiveArticleId());
-                                       var ctr = $("headlines-frame");
+                               var article = $("RROW-" + getActiveArticleId());
+                               var ctr = $("headlines-frame");
 
-                                       if (!noscroll && article && article.offsetTop + article.offsetHeight >
-                                                       ctr.scrollTop + ctr.offsetHeight) {
+                               if (!noscroll && article && article.offsetTop + article.offsetHeight >
+                                               ctr.scrollTop + ctr.offsetHeight) {
 
-                                               scrollArticle(ctr.offsetHeight/4);
-
-                                       } else if (next_id) {
-                                               cdmExpandArticle(next_id, noexpand);
-                                               cdmScrollToArticleId(next_id, true);
-                                       }
+                                       scrollArticle(ctr.offsetHeight/4);
 
                                } else if (next_id) {
-                                       correctHeadlinesOffset(next_id);
-                                       view(next_id, getActiveFeedId(), noexpand);
+                                       cdmScrollToArticleId(next_id, true);
                                }
+
+                       } else if (next_id) {
+                               correctHeadlinesOffset(next_id);
+                               view(next_id, getActiveFeedId(), noexpand);
                        }
                }
+       }
 
-               if (mode == "prev") {
-                       if (prev_id || getActiveArticleId()) {
-                               if (isCdmMode()) {
-
-                                       var article = $("RROW-" + getActiveArticleId());
-                                       var 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 (mode == "prev") {
+               if (prev_id || getActiveArticleId()) {
+                       if (isCdmMode()) {
 
-                                               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);
-                                               }
-                                       }
+                               var article = $("RROW-" + getActiveArticleId());
+                               const prev_article = $("RROW-" + prev_id);
+                               var ctr = $("headlines-frame");
 
+                               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) {
-                                       correctHeadlinesOffset(prev_id);
-                                       view(prev_id, getActiveFeedId(), noexpand);
+                                       cdmScrollToArticleId(prev_id, noscroll);
                                }
+
+                       } else if (prev_id) {
+                               correctHeadlinesOffset(prev_id);
+                               view(prev_id, getActiveFeedId(), noexpand);
                        }
                }
-
-       } catch (e) {
-               exception_error("moveToPost", e);
        }
+
 }
 
 function toggleSelected(id, force_on) {
-       try {
-               var row = $("RROW-" + id);
+       const row = $("RROW-" + id);
 
-               if (row) {
-                       var cb = dijit.getEnclosingWidget(
-                                       row.getElementsByClassName("rchk")[0]);
+       if (row) {
+               const cb = dijit.getEnclosingWidget(
+                               row.getElementsByClassName("rchk")[0]);
 
-                       if (row.hasClassName('Selected') && !force_on) {
-                               row.removeClassName('Selected');
-                               if (cb) cb.attr("checked", false);
-                       } else {
-                               row.addClassName('Selected');
-                               if (cb) cb.attr("checked", true);
-                       }
+               if (row.hasClassName('Selected') && !force_on) {
+                       row.removeClassName('Selected');
+                       if (cb) cb.attr("checked", false);
+               } else {
+                       row.addClassName('Selected');
+                       if (cb) cb.attr("checked", true);
                }
-
-               updateSelectedPrompt();
-       } catch (e) {
-               exception_error("toggleSelected", e);
        }
+
+       updateSelectedPrompt();
 }
 
 function updateSelectedPrompt() {
-       try {
-               var count = getSelectedArticleIds2().size();
-               var elem = $("selected_prompt");
+       const count = getSelectedArticleIds2().length;
+       const elem = $("selected_prompt");
 
-               if (elem) {
-                       elem.innerHTML = ngettext("%d article selected",
-                                       "%d articles selected", count).replace("%d", count);
-
-                       if (count > 0)
-                               Element.show(elem);
-                       else
-                               Element.hide(elem);
-               }
+       if (elem) {
+               elem.innerHTML = ngettext("%d article selected",
+                               "%d articles selected", count).replace("%d", count);
 
-       } catch (e) {
-               exception_error("updateSelectedPrompt", e);
+               if (count > 0)
+                       Element.show(elem);
+               else
+                       Element.hide(elem);
        }
-}
-
-function toggleUnread(id, cmode, effect) {
-       try {
-
-               var row = $("RROW-" + id);
-               if (row) {
-                       var tmpClassName = row.className;
-
-                       if (cmode == undefined || cmode == 2) {
-                               if (row.hasClassName("Unread")) {
-                                       row.removeClassName("Unread");
 
-                               } else {
-                                       row.addClassName("Unread");
-                               }
+}
 
-                       } else if (cmode == 0) {
+function toggleUnread(id, cmode) {
+       const row = $("RROW-" + id);
+       if (row) {
+               const tmpClassName = row.className;
 
+               if (cmode == undefined || cmode == 2) {
+                       if (row.hasClassName("Unread")) {
                                row.removeClassName("Unread");
 
-                       } else if (cmode == 1) {
+                       } else {
                                row.addClassName("Unread");
                        }
 
-                       if (cmode == undefined) cmode = 2;
+               } else if (cmode == 0) {
 
-                       var query = "?op=rpc&method=catchupSelected" +
-                               "&cmode=" + param_escape(cmode) + "&ids=" + param_escape(id);
-
-//                     notify_progress("Loading, please wait...");
-
-                       if (tmpClassName != row.className) {
-                               new Ajax.Request("backend.php", {
-                                       parameters: query,
-                                       onComplete: function (transport) {
-                                               handle_rpc_json(transport);
-                                       }
-                               });
-                       }
+                       row.removeClassName("Unread");
 
+               } else if (cmode == 1) {
+                       row.addClassName("Unread");
                }
 
-       } catch (e) {
-               exception_error("toggleUnread", e);
-       }
-}
+               if (tmpClassName != row.className) {
+            if (cmode == undefined) cmode = 2;
 
-function selectionRemoveLabel(id, ids) {
-       try {
+            const query = {op: "rpc", method: "catchupSelected",
+                cmode: cmode, ids: id};
 
-               if (!ids) ids = getSelectedArticleIds2();
+            xhrPost("backend.php", query, (transport) => {
+                                       handle_rpc_json(transport);
 
-               if (ids.length == 0) {
-                       alert(__("No articles are selected."));
-                       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);
-                       } });
-
-       } catch (e) {
-               exception_error("selectionAssignLabel", e);
-
        }
 }
 
-function selectionAssignLabel(id, ids) {
-       try {
+function selectionRemoveLabel(id, ids) {
+       if (!ids) ids = getSelectedArticleIds2();
 
-               if (!ids) ids = getSelectedArticleIds2();
+       if (ids.length == 0) {
+               alert(__("No articles are selected."));
+               return;
+       }
 
-               if (ids.length == 0) {
-                       alert(__("No articles are selected."));
-                       return;
-               }
+       const query = { op: "article", method: "removeFromLabel",
+               ids: ids.toString(), lid: id };
 
-               var query = "?op=article&method=assignToLabel&ids=" +
-                       param_escape(ids.toString()) + "&lid=" + param_escape(id);
+       xhrPost("backend.php", query, (transport) => {
+        handle_rpc_json(transport);
+        show_labels_in_headlines(transport);
+       });
+}
 
-               console.log(query);
+function selectionAssignLabel(id, ids) {
+       if (!ids) ids = getSelectedArticleIds2();
 
-               new Ajax.Request("backend.php", {
-                       parameters: query,
-                       onComplete: function(transport) {
-                               handle_rpc_json(transport);
-                               show_labels_in_headlines(transport);
-                       } });
+       if (ids.length == 0) {
+               alert(__("No articles are selected."));
+               return;
+       }
 
-       } catch (e) {
-               exception_error("selectionAssignLabel", e);
+       const query = { op: "article", method: "assignToLabel",
+               ids: ids.toString(), lid: id };
 
-       }
+    xhrPost("backend.php", query, (transport) => {
+        handle_rpc_json(transport);
+        show_labels_in_headlines(transport);
+    });
 }
 
 function selectionToggleUnread(set_state, callback, no_error, ids) {
-       try {
-               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]);
-                       if (row) {
-                               if (set_state == undefined) {
-                                       if (row.hasClassName("Unread")) {
-                                               row.removeClassName("Unread");
-                                       } else {
-                                               row.addClassName("Unread");
-                                       }
-                               }
+       if (rows.length == 0 && !no_error) {
+               alert(__("No articles are selected."));
+               return;
+       }
 
-                               if (set_state == false) {
+       for (let i = 0; i < rows.length; i++) {
+               const row = $("RROW-" + rows[i]);
+               if (row) {
+                       if (set_state == undefined) {
+                               if (row.hasClassName("Unread")) {
                                        row.removeClassName("Unread");
-                               }
-
-                               if (set_state == true) {
+                               } else {
                                        row.addClassName("Unread");
                                }
                        }
-               }
-
-               updateFloatingTitle(true);
-
-               if (rows.length > 0) {
 
-                       var cmode = "";
+                       if (set_state == false) {
+                               row.removeClassName("Unread");
+                       }
 
-                       if (set_state == undefined) {
-                               cmode = "2";
-                       } else if (set_state == true) {
-                               cmode = "1";
-                       } else if (set_state == false) {
-                               cmode = "0";
+                       if (set_state == true) {
+                               row.addClassName("Unread");
                        }
+               }
+       }
 
-                       var query = "?op=rpc&method=catchupSelected" +
-                               "&cmode=" + cmode + "&ids=" + param_escape(rows.toString());
+       updateFloatingTitle(true);
 
-                       notify_progress("Loading, please wait...");
+       if (rows.length > 0) {
 
-                       new Ajax.Request("backend.php", {
-                               parameters: query,
-                               onComplete: function(transport) {
-                                       handle_rpc_json(transport);
-                                       if (callback) callback(transport);
-                               } });
+               let cmode = "";
 
+               if (set_state == undefined) {
+                       cmode = "2";
+               } else if (set_state == true) {
+                       cmode = "1";
+               } else if (set_state == false) {
+                       cmode = "0";
                }
 
-       } catch (e) {
-               exception_error("selectionToggleUnread", e);
+               const query = {op: "rpc", method: "catchupSelected",
+                       cmode: cmode, ids: rows.toString() };
+
+               notify_progress("Loading, please wait...");
+
+        xhrPost("backend.php", query, (transport) => {
+            handle_rpc_json(transport);
+            if (callback) callback(transport);
+        });
+
        }
 }
 
 // sel_state ignored
 function selectionToggleMarked(sel_state, callback, no_error, ids) {
-       try {
+       const rows = ids ? ids : getSelectedArticleIds2();
 
-               var rows = ids ? ids : getSelectedArticleIds2();
-
-               if (rows.length == 0 && !no_error) {
-                       alert(__("No articles are selected."));
-                       return;
-               }
-
-               for (var i = 0; i < rows.length; i++) {
-                       toggleMark(rows[i], true, true);
-               }
-
-               if (rows.length > 0) {
-
-                       var query = "?op=rpc&method=markSelected&ids=" +
-                               param_escape(rows.toString()) + "&cmode=2";
+       if (rows.length == 0 && !no_error) {
+               alert(__("No articles are selected."));
+               return;
+       }
 
-                       new Ajax.Request("backend.php", {
-                               parameters: query,
-                               onComplete: function(transport) {
-                                       handle_rpc_json(transport);
-                                       if (callback) callback(transport);
-                               } });
+       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 };
 
-       } catch (e) {
-               exception_error("selectionToggleMarked", e);
+        xhrPost("backend.php", query, (transport) => {
+            handle_rpc_json(transport);
+            if (callback) callback(transport);
+        });
        }
 }
 
 // sel_state ignored
 function selectionTogglePublished(sel_state, callback, no_error, ids) {
-       try {
-
-               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++) {
-                       togglePub(rows[i], true, true);
-               }
-
-               if (rows.length > 0) {
-
-                       var query = "?op=rpc&method=publishSelected&ids=" +
-                               param_escape(rows.toString()) + "&cmode=2";
+       if (rows.length == 0 && !no_error) {
+               alert(__("No articles are selected."));
+               return;
+       }
 
-                       new Ajax.Request("backend.php", {
-                               parameters: query,
-                               onComplete: function(transport) {
-                                       handle_rpc_json(transport);
-                               } });
+       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 };
 
-       } catch (e) {
-               exception_error("selectionToggleMarked", e);
+        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) {
-                       rv.push(child.id.replace("RROW-", ""));
+                       rv.push(child.getAttribute("data-article-id"));
                });
 
        return rv;
 }
 
 function getLoadedArticleIds() {
-       var rv = [];
+       const rv = [];
 
-       var children = $$("#headlines-frame > div[id*=RROW-]");
+       const children = $$("#headlines-frame > div[id*=RROW-]");
 
        children.each(function(child) {
-                       rv.push(child.id.replace("RROW-", ""));
-               });
+               if (Element.visible(child)) {
+                       rv.push(child.getAttribute("data-article-id"));
+               }
+       });
 
        return rv;
 
@@ -952,267 +763,225 @@ function getLoadedArticleIds() {
 
 // mode = all,none,unread,invert,marked,published
 function selectArticles(mode, query) {
-       try {
+       if (!query) query = "#headlines-frame > div[id*=RROW]";
 
-               if (!query) query = "#headlines-frame > div[id*=RROW]";
+       const children = $$(query);
 
-               var children = $$(query);
-
-               children.each(function(child) {
-                       var id = child.id.replace("RROW-", "");
+       children.each(function(child) {
+               //const id = child.getAttribute("data-article-id");
 
-                       var cb = dijit.getEnclosingWidget(
-                                       child.getElementsByClassName("rchk")[0]);
+               const cb = dijit.getEnclosingWidget(
+                               child.getElementsByClassName("rchk")[0]);
 
-                       if (mode == "all") {
+               if (mode == "all") {
+                       child.addClassName("Selected");
+                       if (cb) cb.attr("checked", true);
+               } else if (mode == "unread") {
+                       if (child.hasClassName("Unread")) {
+                               child.addClassName("Selected");
+                               if (cb) cb.attr("checked", true);
+                       } else {
+                               child.removeClassName("Selected");
+                               if (cb) cb.attr("checked", false);
+                       }
+               } else if (mode == "marked") {
+                       if (child.hasClassName("marked")) {
+                               child.addClassName("Selected");
+                               if (cb) cb.attr("checked", true);
+                       } else {
+                               child.removeClassName("Selected");
+                               if (cb) cb.attr("checked", false);
+                       }
+               } else if (mode == "published") {
+                       if (child.hasClassName("published")) {
                                child.addClassName("Selected");
                                if (cb) cb.attr("checked", true);
-                       } else if (mode == "unread") {
-                               if (child.hasClassName("Unread")) {
-                                       child.addClassName("Selected");
-                                       if (cb) cb.attr("checked", true);
-                               } else {
-                                       child.removeClassName("Selected");
-                                       if (cb) cb.attr("checked", false);
-                               }
-                       } else if (mode == "marked") {
-                               if (child.hasClassName("marked")) {
-                                       child.addClassName("Selected");
-                                       if (cb) cb.attr("checked", true);
-                               } else {
-                                       child.removeClassName("Selected");
-                                       if (cb) cb.attr("checked", false);
-                               }
-                       } else if (mode == "published") {
-                               if (child.hasClassName("published")) {
-                                       child.addClassName("Selected");
-                                       if (cb) cb.attr("checked", true);
-                               } else {
-                                       child.removeClassName("Selected");
-                                       if (cb) cb.attr("checked", false);
-                               }
-
-                       } else if (mode == "invert") {
-                               if (child.hasClassName("Selected")) {
-                                       child.removeClassName("Selected");
-                                       if (cb) cb.attr("checked", false);
-                               } else {
-                                       child.addClassName("Selected");
-                                       if (cb) cb.attr("checked", true);
-                               }
-
                        } else {
                                child.removeClassName("Selected");
                                if (cb) cb.attr("checked", false);
                        }
-               });
 
-               updateSelectedPrompt();
+               } else if (mode == "invert") {
+                       if (child.hasClassName("Selected")) {
+                               child.removeClassName("Selected");
+                               if (cb) cb.attr("checked", false);
+                       } else {
+                               child.addClassName("Selected");
+                               if (cb) cb.attr("checked", true);
+                       }
 
-       } catch (e) {
-               exception_error("selectArticles", e);
-       }
+               } else {
+                       child.removeClassName("Selected");
+                       if (cb) cb.attr("checked", false);
+               }
+       });
+
+       updateSelectedPrompt();
 }
 
 function deleteSelection() {
 
-       try {
-
-               var rows = getSelectedArticleIds2();
-
-               if (rows.length == 0) {
-                       alert(__("No articles are selected."));
-                       return;
-               }
+       const rows = getSelectedArticleIds2();
 
-               var fn = getFeedName(getActiveFeedId(), activeFeedIsCat());
-               var str;
-
-               if (getActiveFeedId() != 0) {
-                       str = ngettext("Delete %d selected article in %s?", "Delete %d selected articles in %s?" , rows.length);
-               } else {
-                       str = ngettext("Delete %d selected article?", "Delete %d selected articles?", rows.length);
-               }
+       if (rows.length == 0) {
+               alert(__("No articles are selected."));
+               return;
+       }
 
-               str = str.replace("%d", rows.length);
-               str = str.replace("%s", fn);
+       const fn = getFeedName(getActiveFeedId(), activeFeedIsCat());
+       let str;
 
-               if (getInitParam("confirm_feed_catchup") == 1 && !confirm(str)) {
-                       return;
-               }
+       if (getActiveFeedId() != 0) {
+               str = ngettext("Delete %d selected article in %s?", "Delete %d selected articles in %s?", rows.length);
+       } else {
+               str = ngettext("Delete %d selected article?", "Delete %d selected articles?", rows.length);
+       }
 
-               query = "?op=rpc&method=delete&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;
+       }
 
-               new Ajax.Request("backend.php", {
-                       parameters: query,
-                       onComplete: function(transport) {
-                                       handle_rpc_json(transport);
-                                       viewCurrentFeed();
-                               } });
+       const query = { op: "rpc", method: "delete", ids: rows.toString() };
 
-       } catch (e) {
-               exception_error("deleteSelection", e);
-       }
+       xhrPost("backend.php", query, (transport) => {
+        handle_rpc_json(transport);
+        viewCurrentFeed();
+       });
 }
 
 function archiveSelection() {
 
-       try {
+    const rows = getSelectedArticleIds2();
 
-               var rows = getSelectedArticleIds2();
+    if (rows.length == 0) {
+        alert(__("No articles are selected."));
+        return;
+    }
 
-               if (rows.length == 0) {
-                       alert(__("No articles are selected."));
-                       return;
-               }
+    const fn = getFeedName(getActiveFeedId(), activeFeedIsCat());
+    let str;
+    let op;
 
-               var fn = getFeedName(getActiveFeedId(), activeFeedIsCat());
-               var str;
-               var op;
+    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 (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 += " " + __("Please note that unstarred articles might get purged on next feed update.");
 
-                       str += " " + __("Please note that unstarred articles might get purged on next feed update.");
+        op = "unarchive";
+    }
 
-                       op = "unarchive";
-               }
+    str = str.replace("%d", rows.length);
+    str = str.replace("%s", fn);
 
-               str = str.replace("%d", rows.length);
-               str = str.replace("%s", fn);
+    if (getInitParam("confirm_feed_catchup") == 1 && !confirm(str)) {
+        return;
+    }
 
-               if (getInitParam("confirm_feed_catchup") == 1 && !confirm(str)) {
-                       return;
-               }
-
-               query = "?op=rpc&method="+op+"&ids=" + param_escape(rows);
+    for (let i = 0; i < rows.length; i++) {
+        cache_delete("article:" + rows[i]);
+    }
 
-               console.log(query);
-
-               for (var i = 0; i < rows.length; i++) {
-                       cache_delete("article:" + rows[i]);
-               }
+    const query = {op: "rpc", method: op, ids: rows.toString()};
 
-               new Ajax.Request("backend.php", {
-                       parameters: query,
-                       onComplete: function(transport) {
-                                       handle_rpc_json(transport);
-                                       viewCurrentFeed();
-                               } });
-
-       } catch (e) {
-               exception_error("archiveSelection", e);
-       }
+    xhrPost("backend.php", query, (transport) => {
+        handle_rpc_json(transport);
+        viewCurrentFeed();
+    });
 }
 
 function catchupSelection() {
 
-       try {
-
-               var rows = getSelectedArticleIds2();
-
-               if (rows.length == 0) {
-                       alert(__("No articles are selected."));
-                       return;
-               }
-
-               var fn = getFeedName(getActiveFeedId(), activeFeedIsCat());
+       const rows = getSelectedArticleIds2();
 
-               var str = ngettext("Mark %d selected article in %s as read?", "Mark %d selected articles in %s as read?", rows.length);
+       if (rows.length == 0) {
+               alert(__("No articles are selected."));
+               return;
+       }
 
-               str = str.replace("%d", rows.length);
-               str = str.replace("%s", fn);
+       const fn = getFeedName(getActiveFeedId(), activeFeedIsCat());
 
-               if (getInitParam("confirm_feed_catchup") == 1 && !confirm(str)) {
-                       return;
-               }
+       let str = ngettext("Mark %d selected article in %s as read?", "Mark %d selected articles in %s as read?", rows.length);
 
-               selectionToggleUnread(false, 'viewCurrentFeed()', true);
+       str = str.replace("%d", rows.length);
+       str = str.replace("%s", fn);
 
-       } catch (e) {
-               exception_error("catchupSelection", e);
+       if (getInitParam("confirm_feed_catchup") == 1 && !confirm(str)) {
+               return;
        }
+
+       selectionToggleUnread(false, 'viewCurrentFeed()', true);
 }
 
 function editArticleTags(id) {
-               var query = "backend.php?op=article&method=editArticleTags&param=" + param_escape(id);
-
-               if (dijit.byId("editTagsDlg"))
-                       dijit.byId("editTagsDlg").destroyRecursive();
-
-               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 = "backend.php?op=article&method=editArticleTags&param=" + param_escape(id);
 
-                                       notify_progress("Saving article tags...", true);
+       if (dijit.byId("editTagsDlg"))
+               dijit.byId("editTagsDlg").destroyRecursive();
 
-                                       new Ajax.Request("backend.php", {
-                                       parameters: query,
-                                       onComplete: function(transport) {
-                                               try {
-                                                       notify('');
-                                                       dialog.hide();
+       const dialog = new dijit.Dialog({
+               id: "editTagsDlg",
+               title: __("Edit article Tags"),
+               style: "width: 600px",
+               execute: function() {
+                       if (this.validate()) {
+                               const query = dojo.objectToQuery(this.attr('value'));
 
-                                                       var data = JSON.parse(transport.responseText);
+                               notify_progress("Saving article tags...", true);
 
-                                                       if (data) {
-                                                               var id = data.id;
+                               xhrPost("backend.php", this.attr('value'), (transport) => {
+                    try {
+                        notify('');
+                        dialog.hide();
 
-                                                               console.log(id);
+                        const data = JSON.parse(transport.responseText);
 
-                                                               var tags = $("ATSTR-" + id);
-                                                               var tooltip = dijit.byId("ATSTRTIP-" + id);
+                        if (data) {
+                            const id = data.id;
 
-                                                               if (tags) tags.innerHTML = data.content;
-                                                               if (tooltip) tooltip.attr('label', data.content_full);
-                                                       }
-                                               } catch (e) {
-                                                       exception_error("editArticleTags/inner", e);
-                                               }
+                            const tags = $("ATSTR-" + id);
+                            const tooltip = dijit.byId("ATSTRTIP-" + id);
 
-                                       }});
-                               }
-                       },
-                       href: query
-               });
+                            if (tags) tags.innerHTML = data.content;
+                            if (tooltip) tooltip.attr('label', data.content_full);
+                        }
+                    } catch (e) {
+                        exception_error(e);
+                    }
+                               });
+                       }
+               },
+               href: query
+       });
 
-               var tmph = dojo.connect(dialog, 'onLoad', function() {
-               dojo.disconnect(tmph);
+       var tmph = dojo.connect(dialog, 'onLoad', function() {
+               dojo.disconnect(tmph);
 
-                       new Ajax.Autocompleter('tags_str', 'tags_choices',
-                          "backend.php?op=article&method=completeTags",
-                          { tokens: ',', paramName: "search" });
-               });
+               new Ajax.Autocompleter('tags_str', 'tags_choices',
+                  "backend.php?op=article&method=completeTags",
+                  { tokens: ',', paramName: "search" });
+       });
 
-               dialog.show();
+       dialog.show();
 
 }
 
 function cdmScrollToArticleId(id, force) {
-       try {
-               var ctr = $("headlines-frame");
-               var e = $("RROW-" + id);
+       const ctr = $("headlines-frame");
+       const e = $("RROW-" + id);
 
-               if (!e || !ctr) return;
+       if (!e || !ctr) return;
 
-               if (force || e.offsetTop+e.offsetHeight > (ctr.scrollTop+ctr.offsetHeight) ||
-                               e.offsetTop < ctr.scrollTop) {
-
-                       // expanded cdm has a 4px margin now
-                       ctr.scrollTop = parseInt(e.offsetTop) - 4;
-               }
+       if (force || e.offsetTop+e.offsetHeight > (ctr.scrollTop+ctr.offsetHeight) ||
+                       e.offsetTop < ctr.scrollTop) {
 
-       } catch (e) {
-               exception_error("cdmScrollToArticleId", e);
+               // expanded cdm has a 4px margin now
+               ctr.scrollTop = parseInt(e.offsetTop) - 4;
        }
 }
 
@@ -1236,360 +1005,221 @@ function postMouseOut(id) {
 }
 
 function unpackVisibleHeadlines() {
-       try {
-               if (!isCdmMode() || !getInitParam("cdm_expanded")) return;
+       if (!isCdmMode()) return;
 
-               $$("#headlines-frame > div[id*=RROW]").each(
-                       function(child) {
-                               if (child.offsetTop <= $("headlines-frame").scrollTop +
-                                       $("headlines-frame").offsetHeight) {
+    const rows = $$("#headlines-frame div[id*=RROW][data-content]");
 
-                                       var cencw = $("CENCW-" + child.id.replace("RROW-", ""));
+    for (let i = 0; i < rows.length; i++) {
+        const row = rows[i];
 
-                                       if (cencw) {
-                                               cencw.innerHTML = htmlspecialchars_decode(cencw.innerHTML);
-                                               cencw.setAttribute('id', '');
+        if (row.offsetTop <= $("headlines-frame").scrollTop + $("headlines-frame").offsetHeight) {
+            console.log("unpacking: " + row.id);
 
-                                               PluginHost.run(PluginHost.HOOK_ARTICLE_RENDERED_CDM, child);
+            const content = row.getAttribute("data-content");
 
-                                               Element.show(cencw);
-                                       }
-                               }
-                       }
-               );
+            row.select(".cdmContentInner")[0].innerHTML = content;
+            row.removeAttribute("data-content");
 
-       } catch (e) {
-               exception_error("unpackVisibleHeadlines", e);
-       }
+            PluginHost.run(PluginHost.HOOK_ARTICLE_RENDERED_CDM, row);
+        } else {
+            break;
+        }
+    }
 }
 
 function headlines_scroll_handler(e) {
        try {
-               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")) {
-                       var rows = $$("#headlines-frame > div[id*=RROW]");
-
-                       for (var i = 0; i < rows.length; i++) {
-                               var child = rows[i];
-
-                               if ($("headlines-frame").scrollTop <= child.offsetTop &&
-                                       child.offsetTop - $("headlines-frame").scrollTop < 100 &&
-                                       child.id.replace("RROW-", "") != _active_article_id) {
-
-                                       if (_active_article_id) {
-                                               var row = $("RROW-" + _active_article_id);
-                                               if (row) row.removeClassName("active");
-                                       }
-
-                                       _active_article_id = child.id.replace("RROW-", "");
-                                       showArticleInHeadlines(_active_article_id, true);
-                                       updateSelectedPrompt();
-                                       break;
-                               }
-                       }
-               }
-
-               if (!_infscroll_disable) {
-                       if (hsp && hsp.offsetTop - 250 <= e.scrollTop + e.offsetHeight) {
-
-                               hsp.innerHTML = "<span class='loading'><img src='images/indicator_tiny.gif'> " +
-                                       __("Loading, please wait...") + "</span>";
-
-                               loadMoreHeadlines();
-                               return;
-
-                       }
-               }
-
-               if (isCdmMode()) {
-                       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)) {
-
-                                               var id = child.id.replace("RROW-", "");
-
-                                               if (catchup_id_batch.indexOf(id) == -1)
-                                                       catchup_id_batch.push(id);
-
-                                               //console.log("auto_catchup_batch: " + catchup_id_batch.toString());
-                                       }
-
-                               });
-
-                       if (_infscroll_disable) {
-                               var child = $$("#headlines-frame div[id*=RROW]").last();
-
-                               if (child && $("headlines-frame").scrollTop >
-                                               (child.offsetTop + child.offsetHeight - 50)) {
-
-                                       console.log("we seem to be at an end");
-
-                                       if (getInitParam("on_catchup_show_next_feed") == "1") {
-                                               openNextUnreadFeed();
-                                       }
-                               }
-                       }
-               }
-
-       } catch (e) {
-               console.warn("headlines_scroll_handler: " + e);
-       }
-}
-
-function openNextUnreadFeed() {
-       try {
-               var is_cat = activeFeedIsCat();
-               var nuf = getNextUnreadFeed(getActiveFeedId(), is_cat);
-               if (nuf) viewfeed({feed: nuf, is_cat: is_cat});
-       } catch (e) {
-               exception_error("openNextUnreadFeed", e);
-       }
-}
-
-function catchupBatchedArticles() {
-       try {
-               if (catchup_id_batch.length > 0 && !_infscroll_request_sent && !_catchup_request_sent) {
-
-                       console.log("catchupBatchedArticles: working");
-
-                       // 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);
-
-                       _catchup_request_sent = true;
-
-                       new Ajax.Request("backend.php", {
-                               parameters: query,
-                               onComplete: function(transport) {
-                                       handle_rpc_json(transport);
-
-                                       _catchup_request_sent = false;
-
-                                       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);
-                                       });
-
-                                       updateFloatingTitle(true);
-
-                               } });
+               // rate-limit in case of smooth scrolling and similar abominations
+               if (Math.max(e.scrollTop, _headlines_scroll_offset) - Math.min(e.scrollTop, _headlines_scroll_offset) < 25) {
+                       return;
                }
 
-       } catch (e) {
-               exception_error("catchupBatchedArticles", e);
-       }
-}
-
-function catchupRelativeToArticle(below, id) {
+               _headlines_scroll_offset = e.scrollTop;
 
-       try {
-
-               if (!id) id = getActiveArticleId();
+               unpackVisibleHeadlines();
 
-               if (!id) {
-                       alert(__("No article is selected."));
-                       return;
-               }
+               // set topmost child in the buffer as active
+               if (isCdmMode() && getInitParam("cdm_auto_catchup") == 1 &&
+                               getSelectedArticleIds2().length <= 1) {
 
-               var visible_ids = getLoadedArticleIds();
+                       const rows = $$("#headlines-frame > div[id*=RROW]");
 
-               var ids_to_mark = new Array();
+                       for (let i = 0; i < rows.length; i++) {
+                               const row = rows[i];
 
-               if (!below) {
-                       for (var i = 0; i < visible_ids.length; i++) {
-                               if (visible_ids[i] != id) {
-                                       var e = $("RROW-" + visible_ids[i]);
+                               if ($("headlines-frame").scrollTop <= row.offsetTop &&
+                                       row.offsetTop - $("headlines-frame").scrollTop < 100 &&
+                                       row.getAttribute("data-article-id") != _active_article_id) {
 
-                                       if (e && e.hasClassName("Unread")) {
-                                               ids_to_mark.push(visible_ids[i]);
+                                       if (_active_article_id) {
+                                               const row = $("RROW-" + _active_article_id);
+                                               if (row) row.removeClassName("active");
                                        }
-                               } else {
-                                       break;
-                               }
-                       }
-               } else {
-                       for (var i = visible_ids.length-1; i >= 0; i--) {
-                               if (visible_ids[i] != id) {
-                                       var e = $("RROW-" + visible_ids[i]);
 
-                                       if (e && e.hasClassName("Unread")) {
-                                               ids_to_mark.push(visible_ids[i]);
-                                       }
-                               } else {
+                                       _active_article_id = row.getAttribute("data-article-id");
+                                       showArticleInHeadlines(_active_article_id, true);
+                                       updateSelectedPrompt();
                                        break;
                                }
                        }
                }
 
-               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);
-
-                       if (getInitParam("confirm_feed_catchup") != 1 || confirm(msg)) {
+               if (!_infscroll_disable) {
+            const hsp = $("headlines-spacer");
 
-                               for (var i = 0; i < ids_to_mark.length; i++) {
-                                       var e = $("RROW-" + ids_to_mark[i]);
-                                       e.removeClassName("Unread");
-                               }
+                       if (hsp && hsp.offsetTop - 250 <= e.scrollTop + e.offsetHeight) {
 
-                               var query = "?op=rpc&method=catchupSelected" +
-                                       "&cmode=0" + "&ids=" + param_escape(ids_to_mark.toString());
+                               hsp.innerHTML = "<span class='loading'><img src='images/indicator_tiny.gif'> " +
+                                       __("Loading, please wait...") + "</span>";
 
-                               new Ajax.Request("backend.php", {
-                                       parameters: query,
-                                       onComplete: function(transport) {
-                                               handle_rpc_json(transport);
-                                       } });
+                               loadMoreHeadlines();
+                               return;
 
                        }
                }
 
-       } catch (e) {
-               exception_error("catchupRelativeToArticle", e);
-       }
-}
-
-function cdmCollapseArticle(event, id, unmark) {
-       try {
-               if (unmark == undefined) unmark = true;
+               if (isCdmMode()) {
+                       updateFloatingTitle();
+               }
 
-               var row = $("RROW-" + id);
-               var elem = $("CICD-" + id);
+               if (getInitParam("cdm_auto_catchup") == 1) {
 
-               if (elem && row) {
-                       var collapse = $$("div#RROW-" + id +
-                               " span[class='collapseBtn']")[0];
+                       let rows = $$("#headlines-frame > div[id*=RROW][class*=Unread]");
 
-                       Element.hide(elem);
-                       Element.show("CEXC-" + id);
-                       Element.hide(collapse);
+                       for (let i = 0; i < rows.length; i++) {
+                const row = rows[i];
+                               
+                               if ($("headlines-frame").scrollTop > (row.offsetTop + row.offsetHeight/2)) {
 
-                       if (unmark) {
-                               row.removeClassName("active");
+                    const id = row.getAttribute("data-article-id")
 
-                               markHeadline(id, false);
+                    if (catchup_id_batch.indexOf(id) == -1)
+                        catchup_id_batch.push(id);
 
-                               if (id == getActiveArticleId()) {
-                                       setActiveArticleId(0);
+                    //console.log("auto_catchup_batch: " + catchup_id_batch.toString());
+                } else {
+                                       break;
                                }
+            }
 
-                               updateSelectedPrompt();
-                       }
-
-                       if (event) Event.stop(event);
+                       if (_infscroll_disable) {
+                               const row = $$("#headlines-frame div[id*=RROW]").last();
 
-                       PluginHost.run(PluginHost.HOOK_ARTICLE_COLLAPSED, id);
+                               if (row && $("headlines-frame").scrollTop >
+                                               (row.offsetTop + row.offsetHeight - 50)) {
 
-                       if (row.offsetTop < $("headlines-frame").scrollTop)
-                               scrollToRowId(row.id);
+                                       console.log("we seem to be at an end");
 
-                       $("floatingTitle").style.visibility = "hidden";
-                       $("floatingTitle").setAttribute("rowid", false);
+                                       if (getInitParam("on_catchup_show_next_feed") == "1") {
+                                               openNextUnreadFeed();
+                                       }
+                               }
+                       }
                }
 
        } catch (e) {
-               exception_error("cdmCollapseArticle", e);
+               console.warn("headlines_scroll_handler: " + e);
        }
 }
 
-function cdmExpandArticle(id, noexpand) {
-       try {
-               console.log("cdmExpandArticle " + id);
+function openNextUnreadFeed() {
+       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) {
 
-               if (!$("RROW-" + id)) return false;
+               console.log("catchupBatchedArticles, size=", catchup_id_batch.length);
 
-               var oldrow = $("RROW-" + getActiveArticleId());
+               // make a copy of the array
+               const batch = catchup_id_batch.slice();
+               const query = { op: "rpc", method: "catchupSelected",
+                       cmode: 0, ids: batch.toString() };
 
-               var elem = $("CICD-" + getActiveArticleId());
+               _catchup_request_sent = true;
 
-               if (id == getActiveArticleId() && Element.visible(elem))
-                       return true;
+               xhrPost("backend.php", query, (transport) => {
+            const reply = handle_rpc_json(transport);
 
-               selectArticles("none");
+            _catchup_request_sent = false;
 
-               var old_offset = $("RROW-" + id).offsetTop;
+            if (reply) {
+                const batch = reply.ids;
 
-               if (getActiveArticleId() && elem && !getInitParam("cdm_expanded")) {
-                       var collapse = $$("div#RROW-" + getActiveArticleId() +
-                               " span[class='collapseBtn']")[0];
+                batch.each(function (id) {
+                    const elem = $("RROW-" + id);
+                    if (elem) elem.removeClassName("Unread");
+                    catchup_id_batch.remove(id);
+                });
+            }
 
-                       Element.hide(elem);
-                       Element.show("CEXC-" + getActiveArticleId());
-                       Element.hide(collapse);
-               }
+            updateFloatingTitle(true);
+               });
+       }
+}
 
-               if (oldrow) oldrow.removeClassName("active");
+function catchupRelativeToArticle(below, id) {
 
-               setActiveArticleId(id);
+       if (!id) id = getActiveArticleId();
 
-               elem = $("CICD-" + id);
+       if (!id) {
+               alert(__("No article is selected."));
+               return;
+       }
 
-               var collapse = $$("div#RROW-" + id +
-                               " span[class='collapseBtn']")[0];
+       const visible_ids = getLoadedArticleIds();
 
-               var cencw = $("CENCW-" + id);
+       const ids_to_mark = [];
 
-               if (!Element.visible(elem) && !noexpand) {
-                       if (cencw) {
-                               cencw.innerHTML = htmlspecialchars_decode(cencw.innerHTML);
-                               cencw.setAttribute('id', '');
-                               Element.show(cencw);
-                       }
+       if (!below) {
+               for (var i = 0; i < visible_ids.length; i++) {
+                       if (visible_ids[i] != id) {
+                               var e = $("RROW-" + visible_ids[i]);
 
-                       Element.show(elem);
-                       Element.hide("CEXC-" + id);
-                       Element.show(collapse);
+                               if (e && e.hasClassName("Unread")) {
+                                       ids_to_mark.push(visible_ids[i]);
+                               }
+                       } else {
+                               break;
+                       }
                }
+       } else {
+               for (var i = visible_ids.length - 1; i >= 0; i--) {
+                       if (visible_ids[i] != id) {
+                               var e = $("RROW-" + visible_ids[i]);
 
-               var new_offset = $("RROW-" + id).offsetTop;
-
-               if (old_offset > new_offset)
-                       $("headlines-frame").scrollTop -= (old_offset-new_offset);
+                               if (e && e.hasClassName("Unread")) {
+                                       ids_to_mark.push(visible_ids[i]);
+                               }
+                       } else {
+                               break;
+                       }
+               }
+       }
 
-               if (!noexpand) {
-                       if (catchup_id_batch.indexOf(id) == -1)
-                               catchup_id_batch.push(id);
+       if (ids_to_mark.length == 0) {
+               alert(__("No articles found to mark"));
+       } else {
+               const msg = ngettext("Mark %d article as read?", "Mark %d articles as read?", ids_to_mark.length).replace("%d", ids_to_mark.length);
 
-                       catchupCurrentBatchIfNeeded();
-               }
+               if (getInitParam("confirm_feed_catchup") != 1 || confirm(msg)) {
 
-               toggleSelected(id);
-               $("RROW-" + id).addClassName("active");
+                       for (var i = 0; i < ids_to_mark.length; i++) {
+                               var e = $("RROW-" + ids_to_mark[i]);
+                               e.removeClassName("Unread");
+                       }
 
-               PluginHost.run(PluginHost.HOOK_ARTICLE_EXPANDED, id);
+                       const query = { op: "rpc", method: "catchupSelected",
+                               cmode: 0, ids: ids_to_mark.toString() };
 
-       } catch (e) {
-               exception_error("cdmExpandArticle", e);
+                       xhrPost("backend.php", query, (transport) => {
+                handle_rpc_json(transport);
+                       });
+               }
        }
-
-       return false;
 }
 
 function getArticleUnderPointer() {
@@ -1597,131 +1227,111 @@ function getArticleUnderPointer() {
 }
 
 function scrollArticle(offset) {
-       try {
-               if (!isCdmMode()) {
-                       var ci = $("content-insert");
-                       if (ci) {
-                               ci.scrollTop += offset;
-                       }
-               } else {
-                       var hi = $("headlines-frame");
-                       if (hi) {
-                               hi.scrollTop += offset;
-                       }
-
+       if (!isCdmMode()) {
+               const ci = $("content-insert");
+               if (ci) {
+                       ci.scrollTop += offset;
                }
-       } catch (e) {
-               exception_error("scrollArticle", e);
+       } else {
+               const hi = $("headlines-frame");
+               if (hi) {
+                       hi.scrollTop += offset;
+               }
+
        }
 }
 
 function show_labels_in_headlines(transport) {
-       try {
-               var data = JSON.parse(transport.responseText);
+       const data = JSON.parse(transport.responseText);
 
-               if (data) {
-                       data['info-for-headlines'].each(function(elem) {
-                               $$(".HLLCTR-" + elem.id).each(function(ctr) {
-                                       ctr.innerHTML = elem.labels;
-                               });
+       if (data) {
+               data['info-for-headlines'].each(function (elem) {
+                       $$(".HLLCTR-" + elem.id).each(function (ctr) {
+                               ctr.innerHTML = elem.labels;
                        });
-               }
-       } catch (e) {
-               exception_error("show_labels_in_headlines", e);
+               });
        }
 }
 
-function cdmClicked(event, id) {
-       try {
-               //var shift_key = event.shiftKey;
-
-               if (!event.ctrlKey && !event.metaKey) {
-
-                       if (!getInitParam("cdm_expanded")) {
-                               return cdmExpandArticle(id);
-                       } else {
-
-                               var elem = $("RROW-" + getActiveArticleId());
+function cdmClicked(event, id, in_body) {
+       //var shift_key = event.shiftKey;
 
-                               if (elem) elem.removeClassName("active");
+       if (!event.ctrlKey && !event.metaKey) {
 
-                               selectArticles("none");
-                               toggleSelected(id);
+               let elem = $("RROW-" + getActiveArticleId());
 
-                               var elem = $("RROW-" + id);
-                               var article_is_unread = elem.hasClassName("Unread");
+               if (elem) elem.removeClassName("active");
 
-                               elem.removeClassName("Unread");
-                               elem.addClassName("active");
+               selectArticles("none");
+               toggleSelected(id);
 
-                               setActiveArticleId(id);
+               elem = $("RROW-" + id);
+               const article_is_unread = elem.hasClassName("Unread");
 
-                               if (article_is_unread) {
-                                       decrementFeedCounter(getActiveFeedId(), activeFeedIsCat());
-                                       updateFloatingTitle(true);
-                               }
+               elem.removeClassName("Unread");
+               elem.addClassName("active");
 
-                               var query = "?op=rpc&method=catchupSelected" +
-                                       "&cmode=0&ids=" + param_escape(id);
+               setActiveArticleId(id);
 
-                               new Ajax.Request("backend.php", {
-                                       parameters: query,
-                                       onComplete: function(transport) {
-                                               handle_rpc_json(transport);
-                                       } });
+               if (article_is_unread) {
+                       decrementFeedCounter(getActiveFeedId(), activeFeedIsCat());
+                       updateFloatingTitle(true);
 
-                               return !event.shiftKey;
-                       }
+                       const query = {
+                               op: "rpc", method: "catchupSelected",
+                               cmode: 0, ids: id
+                       };
 
-               } else if (event.target.parents(".cdmHeader").length > 0) {
+                       xhrPost("backend.php", query, (transport) => {
+                               handle_rpc_json(transport);
+                       });
+               }
 
-                       toggleSelected(id, true);
+               return !event.shiftKey;
 
-                       var elem = $("RROW-" + id);
-                       var article_is_unread = elem.hasClassName("Unread");
+       } else if (!in_body) {
 
-                       if (article_is_unread) {
-                               decrementFeedCounter(getActiveFeedId(), activeFeedIsCat());
-                       }
+               toggleSelected(id, true);
 
-                       toggleUnread(id, 0, false);
+               let elem = $("RROW-" + id);
+               const article_is_unread = elem.hasClassName("Unread");
 
-                       openArticleInNewWindow(id);
+               if (article_is_unread) {
+                       decrementFeedCounter(getActiveFeedId(), activeFeedIsCat());
                }
 
-               var unread_in_buffer = $$("#headlines-frame > div[id*=RROW][class*=Unread]").length
-               request_counters(unread_in_buffer == 0);
+               toggleUnread(id, 0, false);
 
-       } catch (e) {
-               exception_error("cdmClicked");
+               openArticleInNewWindow(id);
+       } else {
+               return true;
        }
 
+       const unread_in_buffer = $$("#headlines-frame > div[id*=RROW][class*=Unread]").length
+       request_counters(unread_in_buffer == 0);
+
        return false;
 }
 
 function hlClicked(event, id) {
-       try {
-               if (event.which == 2) {
-                       view(id);
-                       return true;
-               } else if (event.ctrlKey || event.metaKey) {
-                       toggleSelected(id, true);
-                       toggleUnread(id, 0, false);
-                       openArticleInNewWindow(id);
-                       return false;
-               } else {
-                       view(id);
-                       return false;
-               }
-
-       } catch (e) {
-               exception_error("hlClicked");
+       if (event.which == 2) {
+               view(id);
+               return true;
+       } else if (event.ctrlKey || event.metaKey) {
+               openArticleInNewWindow(id);
+               return false;
+       } else {
+               view(id);
+               return false;
        }
 }
 
 function openArticleInNewWindow(id) {
        toggleUnread(id, 0, false);
-       window.open("backend.php?op=article&method=redirect&id=" + id);
+
+       const w = window.open("");
+       w.opener = null;
+       w.location = "backend.php?op=article&method=redirect&id=" + id;
 }
 
 function isCdmMode() {
@@ -1731,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) {
@@ -1749,26 +1359,20 @@ function markHeadline(id, marked) {
 
 function getRelativePostIds(id, limit) {
 
-       var tmp = [];
+       const tmp = [];
 
-       try {
-
-               if (!limit) limit = 6; //3
+       if (!limit) limit = 6; //3
 
-               var ids = getLoadedArticleIds();
+       const ids = getLoadedArticleIds();
 
-               for (var i = 0; i < ids.length; i++) {
-                       if (ids[i] == id) {
-                               for (var k = 1; k <= limit; k++) {
-                                       //if (i > k-1) tmp.push(ids[i-k]);
-                                       if (i < ids.length-k) tmp.push(ids[i+k]);
-                               }
-                               break;
+       for (let i = 0; i < ids.length; i++) {
+               if (ids[i] == id) {
+                       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]);
                        }
+                       break;
                }
-
-       } catch (e) {
-               exception_error("getRelativePostIds", e);
        }
 
        return tmp;
@@ -1776,44 +1380,33 @@ function getRelativePostIds(id, limit) {
 
 function correctHeadlinesOffset(id) {
 
-       try {
-
-               var container = $("headlines-frame");
-               var row = $("RROW-" + id);
+       const container = $("headlines-frame");
+       const row = $("RROW-" + id);
 
-               if (!container || !row) return;
+       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);
+       //console.log("Rtop: " + rel_offset_top + " Rbtm: " + rel_offset_bottom);
+       //console.log("Vport: " + viewport);
 
-               if (rel_offset_top <= 0 || rel_offset_top > viewport) {
-                       container.scrollTop = row.offsetTop;
-               } else if (rel_offset_bottom > viewport) {
+       if (rel_offset_top <= 0 || rel_offset_top > viewport) {
+               container.scrollTop = row.offsetTop;
+       } else if (rel_offset_bottom > viewport) {
 
-                       /* doesn't properly work with Opera in some cases because
-                               Opera fucks up element scrolling */
+               /* doesn't properly work with Opera in some cases because
+                Opera fucks up element scrolling */
 
-                       container.scrollTop = row.offsetTop + row.offsetHeight - viewport;
-               }
-
-       } catch (e) {
-               exception_error("correctHeadlinesOffset", e);
+               container.scrollTop = row.offsetTop + row.offsetHeight - viewport;
        }
-
 }
 
 function headlineActionsChange(elem) {
-       try {
-               eval(elem.value);
-               elem.attr('value', 'false');
-       } catch (e) {
-               exception_error("headlineActionsChange", e);
-       }
+       eval(elem.value);
+       elem.attr('value', 'false');
 }
 
 function closeArticlePanel() {
@@ -1824,265 +1417,209 @@ function closeArticlePanel() {
 }
 
 function initFloatingMenu() {
-       try {
-               if (dijit.byId("floatingMenu"))
-                       dijit.byId("floatingMenu").destroyRecursive();
+       if (!dijit.byId("floatingMenu")) {
 
-                       var menu = new dijit.Menu({
-                               id: "floatingMenu",
-                               targetNodeIds: ["floatingTitle"]
-                       });
-
-                       var id = $("floatingTitle").getAttribute("rowid").replace("RROW-", "");
+               const menu = new dijit.Menu({
+                       id: "floatingMenu",
+                       targetNodeIds: ["floatingTitle"]
+               });
 
-                       headlinesMenuCommon(menu, id);
+               headlinesMenuCommon(menu);
 
-                       menu.startup();
-       } catch (e) {
-               exception_error("initFloatingMenu", e);
+               menu.startup();
        }
 }
 
-function headlinesMenuCommon(menu, base_id) {
-       try {
-
-               menu.addChild(new dijit.MenuItem({
-                       label: __("Open original article"),
-                       onClick: function(event) {
-                               openArticleInNewWindow(base_id ? base_id : this.getParent().callerRowId);
-                       }}));
+function headlinesMenuCommon(menu) {
 
-               menu.addChild(new dijit.MenuItem({
-                       label: __("Display article URL"),
-                       onClick: function(event) {
-                               displayArticleUrl(base_id ? base_id : this.getParent().callerRowId);
-                       }}));
+       menu.addChild(new dijit.MenuItem({
+               label: __("Open original article"),
+               onClick: function (event) {
+                       openArticleInNewWindow(this.getParent().currentTarget.getAttribute("data-article-id"));
+               }
+       }));
 
-               menu.addChild(new dijit.MenuSeparator());
+       menu.addChild(new dijit.MenuItem({
+               label: __("Display article URL"),
+               onClick: function (event) {
+                       displayArticleUrl(this.getParent().currentTarget.getAttribute("data-article-id"));
+               }
+       }));
 
-               menu.addChild(new dijit.MenuItem({
-                       label: __("Toggle unread"),
-                       onClick: function(event) {
-                               var ids = getSelectedArticleIds2();
-                               // cast to string
-                               var id = (base_id ? base_id : this.getParent().callerRowId) + "";
-                               ids = ids.size() != 0 && ids.indexOf(id) != -1 ? ids : [id];
+       menu.addChild(new dijit.MenuSeparator());
 
-                               selectionToggleUnread(undefined, false, true, ids);
-                               }}));
+       menu.addChild(new dijit.MenuItem({
+               label: __("Toggle unread"),
+               onClick: function () {
 
-               menu.addChild(new dijit.MenuItem({
-                       label: __("Toggle starred"),
-                       onClick: function(event) {
-                               var ids = getSelectedArticleIds2();
-                               // cast to string
-                               var id = (base_id ? base_id : this.getParent().callerRowId) + "";
-                               ids = ids.size() != 0 && ids.indexOf(id) != -1 ? ids : [id];
+                       let ids = getSelectedArticleIds2();
+                       // cast to string
+                       const id = (this.getParent().currentTarget.getAttribute("data-article-id")) + "";
+                       ids = ids.length != 0 && ids.indexOf(id) != -1 ? ids : [id];
 
-                               selectionToggleMarked(undefined, false, true, ids);
-                               }}));
+                       selectionToggleUnread(undefined, false, true, ids);
+               }
+       }));
 
-               menu.addChild(new dijit.MenuItem({
-                       label: __("Toggle published"),
-                       onClick: function(event) {
-                               var ids = getSelectedArticleIds2();
-                               // cast to string
-                               var id = (base_id ? base_id : this.getParent().callerRowId) + "";
-                               ids = ids.size() != 0 && ids.indexOf(id) != -1 ? ids : [id];
+       menu.addChild(new dijit.MenuItem({
+               label: __("Toggle starred"),
+               onClick: function () {
+                       let ids = getSelectedArticleIds2();
+                       // cast to string
+                       const id = (this.getParent().currentTarget.getAttribute("data-article-id")) + "";
+                       ids = ids.length != 0 && ids.indexOf(id) != -1 ? ids : [id];
 
-                               selectionTogglePublished(undefined, false, true, ids);
-                               }}));
+                       selectionToggleMarked(undefined, false, true, ids);
+               }
+       }));
 
-               menu.addChild(new dijit.MenuSeparator());
+       menu.addChild(new dijit.MenuItem({
+               label: __("Toggle published"),
+               onClick: function () {
+                       let ids = getSelectedArticleIds2();
+                       // cast to string
+                       const id = (this.getParent().currentTarget.getAttribute("data-article-id")) + "";
+                       ids = ids.length != 0 && ids.indexOf(id) != -1 ? ids : [id];
 
-               menu.addChild(new dijit.MenuItem({
-                       label: __("Mark above as read"),
-                       onClick: function(event) {
-                               catchupRelativeToArticle(0, base_id ? base_id : this.getParent().callerRowId);
-                               }}));
+                       selectionTogglePublished(undefined, false, true, ids);
+               }
+       }));
 
-               menu.addChild(new dijit.MenuItem({
-                       label: __("Mark below as read"),
-                       onClick: function(event) {
-                               catchupRelativeToArticle(1, base_id ? base_id : this.getParent().callerRowId);
-                               }}));
+       menu.addChild(new dijit.MenuSeparator());
 
+       menu.addChild(new dijit.MenuItem({
+               label: __("Mark above as read"),
+               onClick: function () {
+                       catchupRelativeToArticle(0, this.getParent().currentTarget.getAttribute("data-article-id"));
+               }
+       }));
 
-               var labels = dijit.byId("feedTree").model.getItemsInCategory(-2);
+       menu.addChild(new dijit.MenuItem({
+               label: __("Mark below as read"),
+               onClick: function () {
+                       catchupRelativeToArticle(1, this.getParent().currentTarget.getAttribute("data-article-id"));
+               }
+       }));
 
-               if (labels) {
 
-                       menu.addChild(new dijit.MenuSeparator());
+       const labels = getInitParam("labels");
 
-                       var labelAddMenu = new dijit.Menu({ownerMenu: menu});
-                       var labelDelMenu = new dijit.Menu({ownerMenu: menu});
+       if (labels && labels.length) {
 
-                       labels.each(function(label) {
-                               var id = label.id[0];
-                               var bare_id = id.substr(id.indexOf(":")+1);
-                               var name = label.name[0];
+               menu.addChild(new dijit.MenuSeparator());
 
-                               bare_id = feed_to_label_id(bare_id);
+               const labelAddMenu = new dijit.Menu({ownerMenu: menu});
+               const labelDelMenu = new dijit.Menu({ownerMenu: menu});
 
-                               labelAddMenu.addChild(new dijit.MenuItem({
-                                       label: name,
-                                       labelId: bare_id,
-                                       onClick: function(event) {
-                                               var ids = getSelectedArticleIds2();
-                                               // cast to string
-                                               var id = (base_id ? base_id : this.getParent().ownerMenu.callerRowId) + "";
+               labels.each(function (label) {
+                       const bare_id = label.id;
+                       const name = label.caption;
 
-                                               ids = ids.size() != 0 && ids.indexOf(id) != -1 ? ids : [id];
+                       labelAddMenu.addChild(new dijit.MenuItem({
+                               label: name,
+                               labelId: bare_id,
+                               onClick: function () {
 
-                                               selectionAssignLabel(this.labelId, ids);
-                               }}));
+                                       let ids = getSelectedArticleIds2();
+                                       // cast to string
+                                       const id = (this.getParent().ownerMenu.currentTarget.getAttribute("data-article-id")) + "";
 
-                               labelDelMenu.addChild(new dijit.MenuItem({
-                                       label: name,
-                                       labelId: bare_id,
-                                       onClick: function(event) {
-                                               var ids = getSelectedArticleIds2();
-                                               // cast to string
-                                               var id = (base_id ? base_id : this.getParent().ownerMenu.callerRowId) + "";
+                                       ids = ids.length != 0 && ids.indexOf(id) != -1 ? ids : [id];
 
-                                               ids = ids.size() != 0 && ids.indexOf(id) != -1 ? ids : [id];
+                                       selectionAssignLabel(this.labelId, ids);
+                               }
+                       }));
 
-                                               selectionRemoveLabel(this.labelId, ids);
-                               }}));
+                       labelDelMenu.addChild(new dijit.MenuItem({
+                               label: name,
+                               labelId: bare_id,
+                               onClick: function () {
+                                       let ids = getSelectedArticleIds2();
+                                       // cast to string
+                                       const id = (this.getParent().ownerMenu.currentTarget.getAttribute("data-article-id")) + "";
 
-                       });
+                                       ids = ids.length != 0 && ids.indexOf(id) != -1 ? ids : [id];
 
-                       menu.addChild(new dijit.PopupMenuItem({
-                               label: __("Assign label"),
-                               popup: labelAddMenu
+                                       selectionRemoveLabel(this.labelId, ids);
+                               }
                        }));
 
-                       menu.addChild(new dijit.PopupMenuItem({
-                               label: __("Remove label"),
-                               popup: labelDelMenu
-                       }));
+               });
 
-               }
+               menu.addChild(new dijit.PopupMenuItem({
+                       label: __("Assign label"),
+                       popup: labelAddMenu
+               }));
 
+               menu.addChild(new dijit.PopupMenuItem({
+                       label: __("Remove label"),
+                       popup: labelDelMenu
+               }));
 
-       } catch (e) {
-               exception_error("headlinesMenuCommon", e);
        }
 }
 
 function initHeadlinesMenu() {
-       try {
-               if (dijit.byId("headlinesMenu"))
-                       dijit.byId("headlinesMenu").destroyRecursive();
-
-               var ids = [];
-
-               if (!isCdmMode()) {
-                       nodes = $$("#headlines-frame > div[id*=RROW]");
-               } else {
-                       nodes = $$("#headlines-frame span[id*=RTITLE]");
-               }
-
-               nodes.each(function(node) {
-                       ids.push(node.id);
-               });
+       if (!dijit.byId("headlinesMenu")) {
 
-               var menu = new dijit.Menu({
+               const menu = new dijit.Menu({
                        id: "headlinesMenu",
-                       targetNodeIds: ids
-               });
-
-               var tmph = dojo.connect(menu, '_openMyself', function (event) {
-                       var callerNode = event.target, match = null, tries = 0;
-
-                       while (match == null && callerNode && tries <= 3) {
-                               match = callerNode.id.match("^[A-Z]+[-]([0-9]+)$");
-                               callerNode = callerNode.parentNode;
-                               ++tries;
-                       }
-
-                       if (match) this.callerRowId = parseInt(match[1]);
-
+                       targetNodeIds: ["headlines-frame"],
+                       selector: ".hlMenuAttach"
                });
 
-               headlinesMenuCommon(menu, false);
+               headlinesMenuCommon(menu);
 
                menu.startup();
+       }
 
-               /* vgroup feed title menu */
+       /* vgroup feed title menu */
 
-               var nodes = $$("#headlines-frame > div[class='cdmFeedTitle']");
-               var ids = [];
+       if (!dijit.byId("headlinesFeedTitleMenu")) {
 
-               nodes.each(function(node) {
-                       ids.push(node.id);
+               const menu = new dijit.Menu({
+                       id: "headlinesFeedTitleMenu",
+                       targetNodeIds: ["headlines-frame"],
+                       selector: "div.cdmFeedTitle"
                });
 
-               if (ids.length > 0) {
-                       if (dijit.byId("headlinesFeedTitleMenu"))
-                               dijit.byId("headlinesFeedTitleMenu").destroyRecursive();
-
-                       var menu = new dijit.Menu({
-                               id: "headlinesFeedTitleMenu",
-                               targetNodeIds: ids
-                       });
-
-                       var tmph = dojo.connect(menu, '_openMyself', function (event) {
-                               var callerNode = event.target, match = null, tries = 0;
-
-                               while (match == null && callerNode && tries <= 3) {
-                                       console.log(callerNode.id);
-
-                                       match = callerNode.id.match("^[A-Z]+[-]([0-9]+)$");
-                                       callerNode = callerNode.parentNode;
-                                       ++tries;
-
-                                       console.log(match[1]);
-                               }
-
-                               if (match) this.callerRowId = parseInt(match[1]);
-
-                       });
-
-                       menu.addChild(new dijit.MenuItem({
-                               label: __("Select articles in group"),
-                               onClick: function(event) {
-                                       selectArticles("all",
-                                               "#headlines-frame > div[id*=RROW]"+
-                                               "[orig-feed-id='"+menu.callerRowId+"']");
-
-                               }}));
-
-                       menu.addChild(new dijit.MenuItem({
-                               label: __("Mark group as read"),
-                               onClick: function(event) {
-                                       selectArticles("none");
-                                       selectArticles("all",
-                                               "#headlines-frame > div[id*=RROW]"+
-                                               "[orig-feed-id='"+menu.callerRowId+"']");
-
-                                       catchupSelection();
-                               }}));
+               menu.addChild(new dijit.MenuItem({
+                       label: __("Select articles in group"),
+                       onClick: function (event) {
+                               selectArticles("all",
+                                       "#headlines-frame > div[id*=RROW]" +
+                                       "[data-orig-feed-id='" + this.getParent().currentTarget.getAttribute("data-feed-id") + "']");
 
+                       }
+               }));
 
-                       menu.addChild(new dijit.MenuItem({
-                               label: __("Mark feed as read"),
-                               onClick: function(event) {
-                                       catchupFeedInGroup(menu.callerRowId);
-                               }}));
+               menu.addChild(new dijit.MenuItem({
+                       label: __("Mark group as read"),
+                       onClick: function () {
+                               selectArticles("none");
+                               selectArticles("all",
+                                       "#headlines-frame > div[id*=RROW]" +
+                                       "[data-orig-feed-id='" + this.getParent().currentTarget.getAttribute("data-feed-id") + "']");
 
-                       menu.addChild(new dijit.MenuItem({
-                               label: __("Edit feed"),
-                               onClick: function(event) {
-                                       editFeed(menu.callerRowId);
-                               }}));
+                               catchupSelection();
+                       }
+               }));
 
-                       menu.startup();
+               menu.addChild(new dijit.MenuItem({
+                       label: __("Mark feed as read"),
+                       onClick: function () {
+                               catchupFeedInGroup(this.getParent().currentTarget.getAttribute("data-feed-id"));
+                       }
+               }));
 
-               }
+               menu.addChild(new dijit.MenuItem({
+                       label: __("Edit feed"),
+                       onClick: function () {
+                               editFeed(this.getParent().currentTarget.getAttribute("data-feed-id"));
+                       }
+               }));
 
-       } catch (e) {
-               exception_error("initHeadlinesMenu", e);
+               menu.startup();
        }
 }
 
@@ -2112,211 +1649,154 @@ function cache_delete(id) {
 }
 
 function cancelSearch() {
-       try {
-               _search_query = "";
-               viewCurrentFeed();
-       } catch (e) {
-               exception_error("cancelSearch", e);
-       }
+       _search_query = "";
+       viewCurrentFeed();
 }
 
 function setSelectionScore() {
-       try {
-               var ids = getSelectedArticleIds2();
-
-               if (ids.length > 0) {
-                       console.log(ids);
-
-                       var score = prompt(__("Please enter new score for selected articles:"), score);
-
-                       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 ids = getSelectedArticleIds2();
 
-               } else {
-                       alert(__("No articles are selected."));
+       if (ids.length > 0) {
+               console.log(ids);
+
+               const score = prompt(__("Please enter new score for selected articles:"));
+
+               if (score != undefined) {
+                       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"]);
+                            }
+                        }
+                    });
+                }
+                       });
                }
-       } catch (e) {
-               exception_error("setSelectionScore", e);
+
+       } else {
+               alert(__("No articles are selected."));
        }
 }
 
+/*
 function updateScore(id) {
-       try {
-               var pic = $$("#RROW-" + id + " .hlScorePic")[0];
-
-               if (pic) {
+       const pic = $$("#RROW-" + id + " .hlScorePic")[0];
 
-                       var query = "op=article&method=getScore&id=" + param_escape(id);
+       if (pic) {
 
-                       new Ajax.Request("backend.php", {
-                               parameters: query,
-                               onComplete: function(transport) {
-                                       console.log(transport.responseText);
+               const query = "op=article&method=getScore&id=" + param_escape(id);
 
-                                       var reply = JSON.parse(transport.responseText);
+               new Ajax.Request("backend.php", {
+                       parameters: query,
+                       onComplete: function (transport) {
+                               console.log(transport.responseText);
 
-                                       if (reply) {
-                                               pic.src = pic.src.replace(/score_.*?\.png/, reply["score_pic"]);
-                                               pic.setAttribute("score", reply["score"]);
-                                               pic.setAttribute("title", reply["score"]);
-                                       }
-                               } });
-               }
+                               const reply = JSON.parse(transport.responseText);
 
-       } catch (e) {
-               exception_error("updateScore", e);
+                               if (reply) {
+                                       pic.src = pic.src.replace(/score_.*?\.png/, reply["score_pic"]);
+                                       pic.setAttribute("score", reply["score"]);
+                                       pic.setAttribute("title", reply["score"]);
+                               }
+                       }
+               });
        }
-}
+} */
 
 function changeScore(id, pic) {
-       try {
-               var score = pic.getAttribute("score");
-
-               var new_score = prompt(__("Please enter new score for this article:"), score);
-
-               if (new_score != undefined) {
+       const score = pic.getAttribute("score");
 
-                       var query = "op=article&method=setScore&id=" + param_escape(id) +
-                               "&score=" + param_escape(new_score);
+       const new_score = prompt(__("Please enter new score for this article:"), score);
 
-                       new Ajax.Request("backend.php", {
-                               parameters: query,
-                               onComplete: function(transport) {
-                                       var reply = JSON.parse(transport.responseText);
+       if (new_score != undefined) {
+               const query = { op: "article", method: "setScore", id: id, score: new_score };
 
-                                       if (reply) {
-                                               pic.src = pic.src.replace(/score_.*?\.png/, reply["score_pic"]);
-                                               pic.setAttribute("score", new_score);
-                                               pic.setAttribute("title", new_score);
-                                       }
-                               } });
-               }
-       } catch (e) {
-               exception_error("changeScore", e);
+               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) {
-       try {
-               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);
+       xhrJson("backend.php", query, (reply) => {
+        if (reply && reply.link) {
+            prompt(__("Article URL:"), reply.link);
+        }
+       });
 
-                                       if (reply && reply.link) {
-                                               prompt(__("Article URL:"), reply.link);
-                                       }
-                               } });
-       } catch (e) {
-               exception_error("changeScore", e);
-       }
 }
 
 function scrollToRowId(id) {
-       try {
-               var row = $(id);
-
-               if (row)
-                       $("headlines-frame").scrollTop = row.offsetTop - 4;
+       const row = $(id);
 
-       } catch (e) {
-               exception_error("scrollToRowId", e);
-       }
+       if (row)
+               $("headlines-frame").scrollTop = row.offsetTop - 4;
 }
 
 function updateFloatingTitle(unread_only) {
-       try {
-               if (!isCdmMode()) return;
-
-               var hf = $("headlines-frame");
+       if (!isCdmMode()) return;
 
-               var elems = $$("#headlines-frame > div[id*=RROW]");
+       const hf = $("headlines-frame");
 
-               for (var i = 0; i < elems.length; i++) {
+       const elems = $$("#headlines-frame > div[id*=RROW]");
 
-                       var child = elems[i];
+       for (let i = 0; i < elems.length; i++) {
 
-                       if (child && child.offsetTop + child.offsetHeight > hf.scrollTop) {
+               const child = elems[i];
 
-                               var header = child.getElementsByClassName("cdmHeader")[0];
+               if (child && child.offsetTop + child.offsetHeight > hf.scrollTop) {
 
-                               if (unread_only || child.id != $("floatingTitle").getAttribute("rowid")) {
-                                       if (child.id != $("floatingTitle").getAttribute("rowid")) {
-                                               $("floatingTitle").setAttribute("rowid", child.id);
-                                               $("floatingTitle").innerHTML = header.innerHTML;
-                                               $("floatingTitle").firstChild.innerHTML = "<img class='anchor markedPic' src='images/page_white_go.png' onclick=\"scrollToRowId('"+child.id+"')\">" + $("floatingTitle").firstChild.innerHTML;
+                       const header = child.getElementsByClassName("cdmHeader")[0];
 
-                                               initFloatingMenu();
+                       if (unread_only || child.getAttribute("data-article-id") != $("floatingTitle").getAttribute("data-article-id")) {
+                               if (child.getAttribute("data-article-id") != $("floatingTitle").getAttribute("data-article-id")) {
 
-                                               var cb = $$("#floatingTitle .dijitCheckBox")[0];
+                                       $("floatingTitle").setAttribute("data-article-id", child.getAttribute("data-article-id"));
+                                       $("floatingTitle").innerHTML = header.innerHTML;
+                                       $("floatingTitle").firstChild.innerHTML = "<img class='anchor markedPic' src='images/page_white_go.png' onclick=\"scrollToRowId('" + child.id + "')\">" + $("floatingTitle").firstChild.innerHTML;
 
-                                               if (cb)
-                                                       cb.parentNode.removeChild(cb);
-                                       }
+                                       initFloatingMenu();
 
-                                       if (child.hasClassName("Unread"))
-                                               $("floatingTitle").addClassName("Unread");
-                                       else
-                                               $("floatingTitle").removeClassName("Unread");
+                                       const cb = $$("#floatingTitle .dijitCheckBox")[0];
 
-                                       PluginHost.run(PluginHost.HOOK_FLOATING_TITLE, child);
+                                       if (cb)
+                                               cb.parentNode.removeChild(cb);
                                }
 
-                               $("floatingTitle").style.marginRight = hf.offsetWidth - child.offsetWidth + "px";
-                               if (header.offsetTop + header.offsetHeight < hf.scrollTop + $("floatingTitle").offsetHeight - 5 &&
-                                   child.offsetTop + child.offsetHeight >= hf.scrollTop + $("floatingTitle").offsetHeight - 5)
-                                       $("floatingTitle").style.visibility = "visible";
+                               if (child.hasClassName("Unread"))
+                                       $("floatingTitle").addClassName("Unread");
                                else
-                                       $("floatingTitle").style.visibility = "hidden";
-
-                               return;
+                                       $("floatingTitle").removeClassName("Unread");
 
+                               PluginHost.run(PluginHost.HOOK_FLOATING_TITLE, child);
                        }
-               }
 
-       } catch (e) {
-               exception_error("updateFloatingTitle", e);
-       }
-}
+                       $("floatingTitle").style.marginRight = hf.offsetWidth - child.offsetWidth + "px";
+                       if (header.offsetTop + header.offsetHeight < hf.scrollTop + $("floatingTitle").offsetHeight - 5 &&
+                               child.offsetTop + child.offsetHeight >= hf.scrollTop + $("floatingTitle").offsetHeight - 5)
+                               $("floatingTitle").style.visibility = "visible";
+                       else
+                               $("floatingTitle").style.visibility = "hidden";
 
-function catchupCurrentBatchIfNeeded() {
-       if (catchup_id_batch.length > 0) {
-               window.clearTimeout(catchup_timeout_id);
-               catchup_timeout_id = window.setTimeout('catchupBatchedArticles()', 1000);
+                       return;
 
-               if (catchup_id_batch.length >= 10) {
-                       catchupBatchedArticles();
                }
        }
 }
-
-function cdmFooterClick(event) {
-       event.stopPropagation();
-}
\ No newline at end of file