]> git.wh0rd.org - tt-rss.git/blobdiff - js/viewfeed.js
set error report url to https
[tt-rss.git] / js / viewfeed.js
old mode 100644 (file)
new mode 100755 (executable)
index 243e998..d8b49c6
@@ -13,6 +13,7 @@ var catchup_timeout_id = false;
 var cids_requested = [];
 var loaded_article_ids = [];
 var _last_headlines_update = 0;
+var _headlines_scroll_offset = 0;
 var current_first_id = 0;
 
 var _catchup_request_sent = false;
@@ -60,7 +61,7 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
                                        $("headlines-frame").scrollTop = 0;
 
                                        $("floatingTitle").style.visibility = "hidden";
-                                       $("floatingTitle").setAttribute("rowid", 0);
+                                       $("floatingTitle").setAttribute("data-article-id", 0);
                                        $("floatingTitle").innerHTML = "";
                                }
                        } catch (e) { };
@@ -92,13 +93,29 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
                                                reply['headlines']['toolbar'],
                                                {parseContent: true});
 
-                               dojo.html.set($("headlines-frame"),
+                               /*dojo.html.set($("headlines-frame"),
                                        reply['headlines']['content'],
                                        {parseContent: true});
 
                                $$("#headlines-frame div[id*='RROW']").each(function(row) {
                                        loaded_article_ids.push(row.id);
-                               });
+                               });*/
+
+                               $("headlines-frame").innerHTML = '';
+
+                               var tmp = new Element("div");
+                               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);
+                                       }
+                               }
 
                                var hsp = $("headlines-spacer");
                                if (!hsp) hsp = new Element("DIV", {"id": "headlines-spacer"});
@@ -138,8 +155,7 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
 
                                                if (loaded_article_ids.indexOf(row.id) == -1 || row.hasClassName("cdmFeedTitle")) {
                                                        dijit.byId("headlines-frame").domNode.appendChild(row);
-                                                       //Element.hide(row);
-                                                       //new Effect.Appear(row, {duration:0.5});
+
                                                        loaded_article_ids.push(row.id);
                                                }
                                        }
@@ -229,6 +245,8 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
 
 function render_article(article) {
        try {
+               cleanup_memory("content-insert");
+
                dijit.byId("headlines-wrap-inner").addChild(
                                dijit.byId("content-insert"));
 
@@ -255,34 +273,18 @@ function render_article(article) {
 function showArticleInHeadlines(id, noexpand) {
 
        try {
-               selectArticles("none");
-
-               var crow = $("RROW-" + id);
-
-               if (!crow) return;
-
-               var article_is_unread = crow.hasClassName("Unread");
+               var row = $("RROW-" + id);
+               if (!row) return;
 
                if (!noexpand)
-                       crow.removeClassName("Unread");
-               crow.addClassName("active");
+                       row.removeClassName("Unread");
 
-               selectArticles('none');
+               row.addClassName("active");
 
-               var view_mode = false;
-
-               try {
-                       view_mode = document.forms['main_toolbar_form'].view_mode;
-                       view_mode = view_mode[view_mode.selectedIndex].value;
-               } catch (e) {
-                       //
-               }
+               selectArticles('none');
 
                markHeadline(id);
 
-               if (article_is_unread && !noexpand)
-                       _force_scheduled_update = true;
-
        } catch (e) {
                exception_error("showArticleInHeadlines", e);
        }
@@ -434,7 +436,7 @@ function toggleMark(id, client_only) {
 
                var ft = $("floatingTitle");
 
-               if (ft && ft.getAttribute("rowid") == "RROW-" + id) {
+               if (ft && ft.getAttribute("data-article-id") == id) {
                        var fte = ft.getElementsByClassName("markedPic");
 
                        for (var i = 0; i < fte.length; i++)
@@ -492,7 +494,7 @@ function togglePub(id, client_only, no_effects, note) {
 
                var ft = $("floatingTitle");
 
-               if (ft && ft.getAttribute("rowid") == "RROW-" + id) {
+               if (ft && ft.getAttribute("data-article-id") == id) {
                        var fte = ft.getElementsByClassName("pubPic");
 
                        for (var i = 0; i < fte.length; i++)
@@ -535,7 +537,7 @@ function moveToPost(mode, noscroll, noexpand) {
 
        try {
 
-               var rows = getVisibleArticleIds();
+               var rows = getLoadedArticleIds();
 
                var prev_id = false;
                var next_id = false;
@@ -565,6 +567,8 @@ function moveToPost(mode, noscroll, noexpand) {
                        }
                }
 
+               console.log("cur: " + getActiveArticleId() + " next: " + next_id);
+
                if (mode == "next") {
                        if (next_id || getActiveArticleId()) {
                                if (isCdmMode()) {
@@ -674,22 +678,13 @@ function updateSelectedPrompt() {
        }
 }
 
-function toggleUnread_afh(effect) {
-       try {
-
-               var elem = effect.element;
-               elem.style.backgroundColor = "";
-
-       } catch (e) {
-               exception_error("toggleUnread_afh", e);
-       }
-}
-
 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");
@@ -713,11 +708,14 @@ function toggleUnread(id, cmode, effect) {
 
 //                     notify_progress("Loading, please wait...");
 
-                       new Ajax.Request("backend.php", {
-                               parameters: query,
-                               onComplete: function(transport) {
-                                       handle_rpc_json(transport);
-                               } });
+                       if (tmpClassName != row.className) {
+                               new Ajax.Request("backend.php", {
+                                       parameters: query,
+                                       onComplete: function (transport) {
+                                               handle_rpc_json(transport);
+                                       }
+                               });
+                       }
 
                }
 
@@ -918,7 +916,7 @@ function getSelectedArticleIds2() {
 
        $$("#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;
@@ -930,8 +928,10 @@ function getLoadedArticleIds() {
        var 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;
 
@@ -946,7 +946,7 @@ function selectArticles(mode, query) {
                var children = $$(query);
 
                children.each(function(child) {
-                       var id = child.id.replace("RROW-", "");
+                       var id = child.getAttribute("data-article-id");
 
                        var cb = dijit.getEnclosingWidget(
                                        child.getElementsByClassName("rchk")[0]);
@@ -1173,7 +1173,7 @@ function editArticleTags(id) {
                });
 
                var tmph = dojo.connect(dialog, 'onLoad', function() {
-               dojo.disconnect(tmph);
+                       dojo.disconnect(tmph);
 
                        new Ajax.Autocompleter('tags_str', 'tags_choices',
                           "backend.php?op=article&method=completeTags",
@@ -1204,6 +1204,8 @@ function cdmScrollToArticleId(id, force) {
 }
 
 function setActiveArticleId(id) {
+       console.log("setActiveArticleId:" + id);
+
        _active_article_id = id;
        PluginHost.run(PluginHost.HOOK_ARTICLE_SET_ACTIVE, _active_article_id);
 }
@@ -1224,21 +1226,21 @@ function unpackVisibleHeadlines() {
        try {
                if (!isCdmMode() || !getInitParam("cdm_expanded")) return;
 
-               $$("#headlines-frame > div[id*=RROW]").each(
+               $$("#headlines-frame span.cencw[id]").each(
                        function(child) {
-                               if (child.offsetTop <= $("headlines-frame").scrollTop +
+                               var row = $("RROW-" + child.id.replace("CENCW-", ""));
+
+                               if (row && row.offsetTop <= $("headlines-frame").scrollTop +
                                        $("headlines-frame").offsetHeight) {
 
-                                       var cencw = $("CENCW-" + child.id.replace("RROW-", ""));
+                                       //console.log("unpacking: " + child.id);
 
-                                       if (cencw) {
-                                               cencw.innerHTML = htmlspecialchars_decode(cencw.innerHTML);
-                                               cencw.setAttribute('id', '');
+                                       child.innerHTML = htmlspecialchars_decode(child.innerHTML);
+                                       child.removeAttribute('id');
 
-                                               PluginHost.run(PluginHost.HOOK_ARTICLE_RENDERED_CDM, child);
+                                       PluginHost.run(PluginHost.HOOK_ARTICLE_RENDERED_CDM, row);
 
-                                               Element.show(cencw);
-                                       }
+                                       Element.show(child);
                                }
                        }
                );
@@ -1250,6 +1252,14 @@ function unpackVisibleHeadlines() {
 
 function headlines_scroll_handler(e) {
        try {
+
+               // 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;
+               }
+
+               _headlines_scroll_offset = e.scrollTop;
+
                var hsp = $("headlines-spacer");
 
                unpackVisibleHeadlines();
@@ -1258,6 +1268,7 @@ function headlines_scroll_handler(e) {
                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++) {
@@ -1265,14 +1276,14 @@ function headlines_scroll_handler(e) {
 
                                if ($("headlines-frame").scrollTop <= child.offsetTop &&
                                        child.offsetTop - $("headlines-frame").scrollTop < 100 &&
-                                       child.id.replace("RROW-", "") != _active_article_id) {
+                                       child.getAttribute("data-article-id") != _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-", "");
+                                       _active_article_id = child.getAttribute("data-article-id");
                                        showArticleInHeadlines(_active_article_id, true);
                                        updateSelectedPrompt();
                                        break;
@@ -1281,7 +1292,7 @@ function headlines_scroll_handler(e) {
                }
 
                if (!_infscroll_disable) {
-                       if (hsp && hsp.offsetTop - 100 <= e.scrollTop + e.offsetHeight) {
+                       if (hsp && hsp.offsetTop - 250 <= e.scrollTop + e.offsetHeight) {
 
                                hsp.innerHTML = "<span class='loading'><img src='images/indicator_tiny.gif'> " +
                                        __("Loading, please wait...") + "</span>";
@@ -1296,6 +1307,8 @@ function headlines_scroll_handler(e) {
                        updateFloatingTitle();
                }
 
+               catchupCurrentBatchIfNeeded();
+
                if (getInitParam("cdm_auto_catchup") == 1) {
 
                        // let's get DOM some time to settle down
@@ -1307,7 +1320,7 @@ function headlines_scroll_handler(e) {
                                        if (child.hasClassName("Unread") && $("headlines-frame").scrollTop >
                                                        (child.offsetTop + child.offsetHeight/2)) {
 
-                                               var id = child.id.replace("RROW-", "");
+                                               var id = child.getAttribute("data-article-id")
 
                                                if (catchup_id_batch.indexOf(id) == -1)
                                                        catchup_id_batch.push(id);
@@ -1317,21 +1330,6 @@ function headlines_scroll_handler(e) {
 
                                });
 
-                       if (catchup_id_batch.length > 0) {
-                               window.clearTimeout(catchup_timeout_id);
-
-                               if (!_infscroll_request_sent) {
-                                       if (catchup_id_batch.length < 10) {
-                                               catchup_timeout_id = window.setTimeout('catchupBatchedArticles()',
-                                                       500);
-                                       } else {
-                                               catchupBatchedArticles();
-                                       }
-                               }
-
-                               catchupBatchedArticles();
-                       }
-
                        if (_infscroll_disable) {
                                var child = $$("#headlines-frame div[id*=RROW]").last();
 
@@ -1356,7 +1354,7 @@ function openNextUnreadFeed() {
        try {
                var is_cat = activeFeedIsCat();
                var nuf = getNextUnreadFeed(getActiveFeedId(), is_cat);
-               if (nuf) viewfeed(nuf, '', is_cat);
+               if (nuf) viewfeed({feed: nuf, is_cat: is_cat});
        } catch (e) {
                exception_error("openNextUnreadFeed", e);
        }
@@ -1366,6 +1364,8 @@ 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" +
@@ -1413,7 +1413,7 @@ function catchupRelativeToArticle(below, id) {
                        return;
                }
 
-               var visible_ids = getVisibleArticleIds();
+               var visible_ids = getLoadedArticleIds();
 
                var ids_to_mark = new Array();
 
@@ -1480,8 +1480,7 @@ function cdmCollapseArticle(event, id, unmark) {
                var elem = $("CICD-" + id);
 
                if (elem && row) {
-                       var collapse = $$("div#RROW-" + id +
-                               " span[class='collapseBtn']")[0];
+                       var collapse = row.select("span[class='collapseBtn']")[0];
 
                        Element.hide(elem);
                        Element.show("CEXC-" + id);
@@ -1507,7 +1506,7 @@ function cdmCollapseArticle(event, id, unmark) {
                                scrollToRowId(row.id);
 
                        $("floatingTitle").style.visibility = "hidden";
-                       $("floatingTitle").setAttribute("rowid", false);
+                       $("floatingTitle").setAttribute("data-article-id", 0);
                }
 
        } catch (e) {
@@ -1517,11 +1516,11 @@ function cdmCollapseArticle(event, id, unmark) {
 
 function cdmExpandArticle(id, noexpand) {
        try {
-               if (getInitParam("cdm_expanded")) return;
-
                console.log("cdmExpandArticle " + id);
 
-               if (!$("RROW-" + id)) return false;
+               var row = $("RROW-" + id);
+
+               if (!row) return false;
 
                var oldrow = $("RROW-" + getActiveArticleId());
 
@@ -1532,11 +1531,10 @@ function cdmExpandArticle(id, noexpand) {
 
                selectArticles("none");
 
-               var old_offset = $("RROW-" + id).offsetTop;
+               var old_offset = row.offsetTop;
 
                if (getActiveArticleId() && elem && !getInitParam("cdm_expanded")) {
-                       var collapse = $$("div#RROW-" + getActiveArticleId() +
-                               " span[class='collapseBtn']")[0];
+                       var collapse = oldrow.select("span[class='collapseBtn']")[0];
 
                        Element.hide(elem);
                        Element.show("CEXC-" + getActiveArticleId());
@@ -1549,8 +1547,7 @@ function cdmExpandArticle(id, noexpand) {
 
                elem = $("CICD-" + id);
 
-               var collapse = $$("div#RROW-" + id +
-                               " span[class='collapseBtn']")[0];
+               var collapse = row.select("span[class='collapseBtn']")[0];
 
                var cencw = $("CENCW-" + id);
 
@@ -1566,16 +1563,20 @@ function cdmExpandArticle(id, noexpand) {
                        Element.show(collapse);
                }
 
-               var new_offset = $("RROW-" + id).offsetTop;
+               var new_offset = row.offsetTop;
 
                if (old_offset > new_offset)
                        $("headlines-frame").scrollTop -= (old_offset-new_offset);
 
-               if (!noexpand)
-                       toggleUnread(id, 0, true);
+               if (!noexpand) {
+                       if (catchup_id_batch.indexOf(id) == -1)
+                               catchup_id_batch.push(id);
+
+                       catchupCurrentBatchIfNeeded();
+               }
 
                toggleSelected(id);
-               $("RROW-" + id).addClassName("active");
+               row.addClassName("active");
 
                PluginHost.run(PluginHost.HOOK_ARTICLE_EXPANDED, id);
 
@@ -1625,120 +1626,11 @@ function show_labels_in_headlines(transport) {
        }
 }
 
-function dismissArticle(id) {
-       try {
-               var elem = $("RROW-" + id);
-
-               if (!elem) return;
-
-               toggleUnread(id, 0, true);
-
-               new Effect.Fade(elem, {duration : 0.5});
-
-               // Remove the content, too
-               var elem_content = $("CICD-" + id);
-               if (elem_content) {
-                       Element.remove(elem_content);
-               }
-
-               if (id == getActiveArticleId()) {
-                       setActiveArticleId(0);
-               }
-
-       } catch (e) {
-               exception_error("dismissArticle", e);
-       }
-}
-
-function dismissSelectedArticles() {
-       try {
-
-               var ids = getVisibleArticleIds();
-               var tmp = [];
-               var sel = [];
-
-               for (var i = 0; i < ids.length; i++) {
-                       var elem = $("RROW-" + ids[i]);
-
-                       if (elem.className && elem.hasClassName("Selected") &&
-                                       ids[i] != getActiveArticleId()) {
-                               new Effect.Fade(elem, {duration : 0.5});
-                               sel.push(ids[i]);
-
-                               // Remove the content, too
-                               var elem_content = $("CICD-" + ids[i]);
-                               if (elem_content) {
-                                       Element.remove(elem_content);
-                               }
-                       } else {
-                               tmp.push(ids[i]);
-                       }
-               }
-
-               if (sel.length > 0)
-                       selectionToggleUnread(false);
-
-
-       } catch (e) {
-               exception_error("dismissSelectedArticles", e);
-       }
-}
-
-function dismissReadArticles() {
-       try {
-
-               var ids = getVisibleArticleIds();
-               var tmp = [];
-
-               for (var i = 0; i < ids.length; i++) {
-                       var elem = $("RROW-" + ids[i]);
-
-                       if (elem.className && !elem.hasClassName("Unread") &&
-                                       !elem.hasClassName("Selected")) {
-
-                               new Effect.Fade(elem, {duration : 0.5});
-
-                               // Remove the content, too
-                               var elem_content = $("CICD-" + ids[i]);
-                               if (elem_content) {
-                                       Element.remove(elem_content);
-                               }
-                       } else {
-                               tmp.push(ids[i]);
-                       }
-               }
-
-       } catch (e) {
-               exception_error("dismissReadArticles", e);
-       }
-}
-
-// we don't really hide rows anymore
-function getVisibleArticleIds() {
-       return getLoadedArticleIds();
-
-       /*var ids = [];
-
-       try {
-
-               getLoadedArticleIds().each(function(id) {
-                       var elem = $("RROW-" + id);
-                       if (elem && Element.visible(elem))
-                               ids.push(id);
-                       });
-
-       } catch (e) {
-               exception_error("getVisibleArticleIds", e);
-       }
-
-       return ids; */
-}
-
 function cdmClicked(event, id) {
        try {
                //var shift_key = event.shiftKey;
 
-               if (!event.ctrlKey) {
+               if (!event.ctrlKey && !event.metaKey) {
 
                        if (!getInitParam("cdm_expanded")) {
                                return cdmExpandArticle(id);
@@ -1807,7 +1699,7 @@ function hlClicked(event, id) {
                if (event.which == 2) {
                        view(id);
                        return true;
-               } else if (event.ctrlKey) {
+               } else if (event.ctrlKey || event.metaKey) {
                        toggleSelected(id, true);
                        toggleUnread(id, 0, false);
                        openArticleInNewWindow(id);
@@ -1822,20 +1714,12 @@ function hlClicked(event, id) {
        }
 }
 
-function getFirstVisibleHeadlineId() {
-       var rows = getVisibleArticleIds();
-       return rows[0];
-
-}
-
-function getLastVisibleHeadlineId() {
-       var rows = getVisibleArticleIds();
-       return rows[rows.length-1];
-}
-
 function openArticleInNewWindow(id) {
        toggleUnread(id, 0, false);
-       window.open("backend.php?op=article&method=redirect&id=" + id);
+
+       var w = window.open("");
+       w.opener = null;
+       w.location = "backend.php?op=article&method=redirect&id=" + id;
 }
 
 function isCdmMode() {
@@ -1869,7 +1753,7 @@ function getRelativePostIds(id, limit) {
 
                if (!limit) limit = 6; //3
 
-               var ids = getVisibleArticleIds();
+               var ids = getLoadedArticleIds();
 
                for (var i = 0; i < ids.length; i++) {
                        if (ids[i] == id) {
@@ -1939,37 +1823,49 @@ 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-", "");
+                       var tmph = dojo.connect(menu, '_openMyself', function (event) {
+                               var callerNode = event.target, match = null, tries = 0;
 
-                       headlinesMenuCommon(menu, id);
+                               while (match == null && callerNode && tries <= 3) {
+                                       match = callerNode.getAttribute("data-article-id");
+                                       callerNode = callerNode.parentNode;
+                                       ++tries;
+                               }
+
+                               if (match) this.callerRowId = match;
+
+                       });
+
+                       headlinesMenuCommon(menu);
 
                        menu.startup();
+               }
+
        } catch (e) {
                exception_error("initFloatingMenu", e);
        }
 }
 
-function headlinesMenuCommon(menu, base_id) {
+function headlinesMenuCommon(menu) {
        try {
 
                menu.addChild(new dijit.MenuItem({
                        label: __("Open original article"),
                        onClick: function(event) {
-                               openArticleInNewWindow(base_id ? base_id : this.getParent().callerRowId);
+                               openArticleInNewWindow(this.getParent().callerRowId);
                        }}));
 
                menu.addChild(new dijit.MenuItem({
                        label: __("Display article URL"),
                        onClick: function(event) {
-                               displayArticleUrl(base_id ? base_id : this.getParent().callerRowId);
+                               displayArticleUrl(this.getParent().callerRowId);
                        }}));
 
                menu.addChild(new dijit.MenuSeparator());
@@ -1979,7 +1875,7 @@ function headlinesMenuCommon(menu, base_id) {
                        onClick: function(event) {
                                var ids = getSelectedArticleIds2();
                                // cast to string
-                               var id = (base_id ? base_id : this.getParent().callerRowId) + "";
+                               var id = (this.getParent().callerRowId) + "";
                                ids = ids.size() != 0 && ids.indexOf(id) != -1 ? ids : [id];
 
                                selectionToggleUnread(undefined, false, true, ids);
@@ -1990,7 +1886,7 @@ function headlinesMenuCommon(menu, base_id) {
                        onClick: function(event) {
                                var ids = getSelectedArticleIds2();
                                // cast to string
-                               var id = (base_id ? base_id : this.getParent().callerRowId) + "";
+                               var id = (this.getParent().callerRowId) + "";
                                ids = ids.size() != 0 && ids.indexOf(id) != -1 ? ids : [id];
 
                                selectionToggleMarked(undefined, false, true, ids);
@@ -2001,7 +1897,7 @@ function headlinesMenuCommon(menu, base_id) {
                        onClick: function(event) {
                                var ids = getSelectedArticleIds2();
                                // cast to string
-                               var id = (base_id ? base_id : this.getParent().callerRowId) + "";
+                               var id = (this.getParent().callerRowId) + "";
                                ids = ids.size() != 0 && ids.indexOf(id) != -1 ? ids : [id];
 
                                selectionTogglePublished(undefined, false, true, ids);
@@ -2012,13 +1908,13 @@ function headlinesMenuCommon(menu, base_id) {
                menu.addChild(new dijit.MenuItem({
                        label: __("Mark above as read"),
                        onClick: function(event) {
-                               catchupRelativeToArticle(0, base_id ? base_id : this.getParent().callerRowId);
+                               catchupRelativeToArticle(0, this.getParent().callerRowId);
                                }}));
 
                menu.addChild(new dijit.MenuItem({
                        label: __("Mark below as read"),
                        onClick: function(event) {
-                               catchupRelativeToArticle(1, base_id ? base_id : this.getParent().callerRowId);
+                               catchupRelativeToArticle(1, this.getParent().callerRowId);
                                }}));
 
 
@@ -2044,7 +1940,7 @@ function headlinesMenuCommon(menu, base_id) {
                                        onClick: function(event) {
                                                var ids = getSelectedArticleIds2();
                                                // cast to string
-                                               var id = (base_id ? base_id : this.getParent().ownerMenu.callerRowId) + "";
+                                               var id = (this.getParent().ownerMenu.callerRowId) + "";
 
                                                ids = ids.size() != 0 && ids.indexOf(id) != -1 ? ids : [id];
 
@@ -2057,7 +1953,7 @@ function headlinesMenuCommon(menu, base_id) {
                                        onClick: function(event) {
                                                var ids = getSelectedArticleIds2();
                                                // cast to string
-                                               var id = (base_id ? base_id : this.getParent().ownerMenu.callerRowId) + "";
+                                               var id = (this.getParent().ownerMenu.callerRowId) + "";
 
                                                ids = ids.size() != 0 && ids.indexOf(id) != -1 ? ids : [id];
 
@@ -2086,107 +1982,93 @@ function headlinesMenuCommon(menu, base_id) {
 
 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]");
-               }
+               if (!dijit.byId("headlinesMenu")) {
 
-               nodes.each(function(node) {
-                       ids.push(node.id);
-               });
+                       var menu = new dijit.Menu({
+                               id: "headlinesMenu",
+                               targetNodeIds: ["headlines-frame"],
+                               selector: ".hlMenuAttach"
+                       });
 
-               var menu = new dijit.Menu({
-                       id: "headlinesMenu",
-                       targetNodeIds: ids
-               });
+                       var tmph = dojo.connect(menu, '_openMyself', function (event) {
+                               var callerNode = event.target, match = null, tries = 0;
 
-               var tmph = dojo.connect(menu, '_openMyself', function (event) {
-                       var callerNode = event.target, match = null, tries = 0;
+                               while (match == null && callerNode && tries <= 3) {
 
-                       while (match == null && callerNode && tries <= 3) {
-                               match = callerNode.id.match("^[A-Z]+[-]([0-9]+)$");
-                               callerNode = callerNode.parentNode;
-                               ++tries;
-                       }
+                                       match = callerNode.getAttribute("data-article-id")
+                                       callerNode = callerNode.parentNode;
+                                       ++tries;
+                               }
 
-                       if (match) this.callerRowId = parseInt(match[1]);
+                               if (match) this.callerRowId = match;
 
-               });
+                       });
 
-               headlinesMenuCommon(menu, false);
+                       headlinesMenuCommon(menu);
 
-               menu.startup();
+                       menu.startup();
+               }
 
                /* vgroup feed title menu */
 
-               var nodes = $$("#headlines-frame > div[class='cdmFeedTitle']");
-               var ids = [];
-
-               nodes.each(function(node) {
-                       ids.push(node.id);
-               });
-
-               if (ids.length > 0) {
-                       if (dijit.byId("headlinesFeedTitleMenu"))
-                               dijit.byId("headlinesFeedTitleMenu").destroyRecursive();
+               if (!dijit.byId("headlinesFeedTitleMenu")) {
 
                        var menu = new dijit.Menu({
                                id: "headlinesFeedTitleMenu",
-                               targetNodeIds: ids
+                               targetNodeIds: ["headlines-frame"],
+                               selector: "div.cdmFeedTitle"
                        });
 
                        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]+)$");
+                                       match = callerNode.getAttribute("data-feed-id")
                                        callerNode = callerNode.parentNode;
                                        ++tries;
-
-                                       console.log(match[1]);
                                }
 
-                               if (match) this.callerRowId = parseInt(match[1]);
+                               if (match) this.callerRowId = match;
 
                        });
 
                        menu.addChild(new dijit.MenuItem({
                                label: __("Select articles in group"),
-                               onClick: function(event) {
+                               onClick: function (event) {
                                        selectArticles("all",
-                                               "#headlines-frame > div[id*=RROW]"+
-                                               "[orig-feed-id='"+menu.callerRowId+"']");
+                                               "#headlines-frame > div[id*=RROW]" +
+                                               "[data-orig-feed-id='" + menu.callerRowId + "']");
 
-                               }}));
+                               }
+                       }));
 
                        menu.addChild(new dijit.MenuItem({
                                label: __("Mark group as read"),
-                               onClick: function(event) {
+                               onClick: function (event) {
                                        selectArticles("none");
                                        selectArticles("all",
-                                               "#headlines-frame > div[id*=RROW]"+
-                                               "[orig-feed-id='"+menu.callerRowId+"']");
+                                               "#headlines-frame > div[id*=RROW]" +
+                                               "[data-orig-feed-id='" + menu.callerRowId + "']");
 
                                        catchupSelection();
-                               }}));
-
+                               }
+                       }));
 
                        menu.addChild(new dijit.MenuItem({
                                label: __("Mark feed as read"),
-                               onClick: function(event) {
+                               onClick: function (event) {
                                        catchupFeedInGroup(menu.callerRowId);
-                               }}));
+                               }
+                       }));
 
-                       menu.startup();
+                       menu.addChild(new dijit.MenuItem({
+                               label: __("Edit feed"),
+                               onClick: function (event) {
+                                       editFeed(menu.callerRowId);
+                               }
+                       }));
 
+                       menu.startup();
                }
 
        } catch (e) {
@@ -2347,20 +2229,6 @@ function displayArticleUrl(id) {
        }
 }
 
-function openSelectedAttachment(elem) {
-       try {
-               var url = elem[elem.selectedIndex].value;
-
-               if (url) {
-                       window.open(url);
-                       elem.selectedIndex = 0;
-               }
-
-       } catch (e) {
-               exception_error("openSelectedAttachment", e);
-       }
-}
-
 function scrollToRowId(id) {
        try {
                var row = $(id);
@@ -2389,9 +2257,10 @@ function updateFloatingTitle(unread_only) {
 
                                var header = child.getElementsByClassName("cdmHeader")[0];
 
-                               if (unread_only || child.id != $("floatingTitle").getAttribute("rowid")) {
-                                       if (child.id != $("floatingTitle").getAttribute("rowid")) {
-                                               $("floatingTitle").setAttribute("rowid", child.id);
+                               if (unread_only || child.getAttribute("data-article-id") != $("floatingTitle").getAttribute("data-article-id")) {
+                                       if (child.getAttribute("data-article-id") != $("floatingTitle").getAttribute("data-article-id")) {
+
+                                               $("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;
 
@@ -2428,6 +2297,17 @@ function updateFloatingTitle(unread_only) {
        }
 }
 
+function catchupCurrentBatchIfNeeded() {
+       if (catchup_id_batch.length > 0) {
+               window.clearTimeout(catchup_timeout_id);
+               catchup_timeout_id = window.setTimeout(catchupBatchedArticles, 1000);
+
+               if (catchup_id_batch.length >= 10) {
+                       catchupBatchedArticles();
+               }
+       }
+}
+
 function cdmFooterClick(event) {
        event.stopPropagation();
 }
\ No newline at end of file