feed tree: only run animation for appearing unread counters to prevent clashes with...

[tt-rss.git] / js / viewfeed.js

diff --git a/js/viewfeed.js b/js/viewfeed.js
index feb397157c04555269e357cc9519237e08decb71..ac9d4225569e3fb77a0aa66d92aeae96e79075f9 100755 (executable)
--- a/js/viewfeed.js
+++ b/js/viewfeed.js
@@ -150,6 +150,8 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
                                        tmp.innerHTML = reply['headlines']['content'];
                                        dojo.parser.parse(tmp);
 
+                                       var new_rows = [];
+
                                        while (tmp.hasChildNodes()) {
                                                var row = tmp.removeChild(tmp.firstChild);
 
@@ -157,6 +159,16 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
                                                        dijit.byId("headlines-frame").domNode.appendChild(row);
 
                                                        loaded_article_ids.push(row.id);
+
+                                                       if (!isCdmMode() || row.hasClassName("cdmFeedTitle")) {
+                                                               new_rows.push(row);
+                                                       } else if (isCdmMode()) {
+                                                               var titleWrap = $$("#" + row.id + " .titleWrap")[0];
+
+                                                               if (titleWrap) {
+                                                                       new_rows.push(titleWrap);
+                                                               }
+                                                       }
                                                }
                                        }
 
@@ -171,7 +183,7 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
                                                markHeadline(ids[i]);
                                        }
 
-                                       initHeadlinesMenu();
+                                       initHeadlinesMenu(new_rows);
 
                                        if (_infscroll_disable) {
                                                hsp.innerHTML = "<a href='#' onclick='openNextUnreadFeed()'>" +
@@ -1978,61 +1990,27 @@ function headlinesMenuCommon(menu) {
        }
 }
 
-function initHeadlinesMenu() {
+function initHeadlinesMenu(append_rows) {
        try {
-               if (dijit.byId("headlinesMenu"))
-                       dijit.byId("headlinesMenu").destroyRecursive();
+               if (!append_rows) {
 
-               var ids = [];
+                       if (dijit.byId("headlinesMenu"))
+                               dijit.byId("headlinesMenu").destroyRecursive();
 
-               if (!isCdmMode()) {
-                       nodes = $$("#headlines-frame > div[id*=RROW]");
-               } else {
-                       nodes = $$("#headlines-frame span[id*=RTITLE]");
-               }
+                       var ids = [];
 
-               nodes.each(function(node) {
-                       ids.push(node.id);
-               });
-
-               var menu = new dijit.Menu({
-                       id: "headlinesMenu",
-                       targetNodeIds: ids
-               });
-
-               var tmph = dojo.connect(menu, '_openMyself', function (event) {
-                       var callerNode = event.target, match = null, tries = 0;
-
-                       while (match == null && callerNode && tries <= 3) {
-
-                               match = callerNode.getAttribute("data-article-id")
-                               callerNode = callerNode.parentNode;
-                               ++tries;
+                       if (!isCdmMode()) {
+                               nodes = $$("#headlines-frame > div[id*=RROW]");
+                       } else {
+                               nodes = $$("#headlines-frame span[id*=RTITLE]");
                        }
 
-                       if (match) this.callerRowId = match;
-
-               });
-
-               headlinesMenuCommon(menu);
-
-               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();
+                       nodes.each(function (node) {
+                               ids.push(node.id);
+                       });
 
                        var menu = new dijit.Menu({
-                               id: "headlinesFeedTitleMenu",
+                               id: "headlinesMenu",
                                targetNodeIds: ids
                        });
 
@@ -2040,7 +2018,8 @@ function initHeadlinesMenu() {
                                var callerNode = event.target, match = null, tries = 0;
 
                                while (match == null && callerNode && tries <= 3) {
-                                       match = callerNode.getAttribute("data-feed-id")
+
+                                       match = callerNode.getAttribute("data-article-id")
                                        callerNode = callerNode.parentNode;
                                        ++tries;
                                }
@@ -2049,41 +2028,99 @@ function initHeadlinesMenu() {
 
                        });
 
-                       menu.addChild(new dijit.MenuItem({
-                               label: __("Select articles in group"),
-                               onClick: function(event) {
-                                       selectArticles("all",
-                                               "#headlines-frame > div[id*=RROW]"+
-                                               "[data-orig-feed-id='"+menu.callerRowId+"']");
+                       headlinesMenuCommon(menu);
 
-                               }}));
+                       menu.startup();
 
-                       menu.addChild(new dijit.MenuItem({
-                               label: __("Mark group as read"),
-                               onClick: function(event) {
-                                       selectArticles("none");
-                                       selectArticles("all",
-                                               "#headlines-frame > div[id*=RROW]"+
-                                               "[data-orig-feed-id='"+menu.callerRowId+"']");
+               } else {
+                       var menu = dijit.byId("headlinesMenu");
 
-                                       catchupSelection();
-                               }}));
+                       append_rows.each(function (row) {
+                               if (!row.hasClassName("cdmFeedTitle")) {
+                                       menu.bindDomNode(row);
+                               }
+                       });
+               }
 
+               /* vgroup feed title menu */
 
-                       menu.addChild(new dijit.MenuItem({
-                               label: __("Mark feed as read"),
-                               onClick: function(event) {
-                                       catchupFeedInGroup(menu.callerRowId);
-                               }}));
+               if (!append_rows) {
 
-                       menu.addChild(new dijit.MenuItem({
-                               label: __("Edit feed"),
-                               onClick: function(event) {
-                                       editFeed(menu.callerRowId);
-                               }}));
+                       var nodes = $$("#headlines-frame > div[class='cdmFeedTitle']");
+                       var ids = [];
 
-                       menu.startup();
+                       nodes.each(function(node) {
+                               ids.push(node.id);
+                       });
+
+                       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) {
+                                               match = callerNode.getAttribute("data-feed-id")
+                                               callerNode = callerNode.parentNode;
+                                               ++tries;
+                                       }
+
+                                       if (match) this.callerRowId = match;
+
+                               });
+
+                               menu.addChild(new dijit.MenuItem({
+                                       label: __("Select articles in group"),
+                                       onClick: function (event) {
+                                               selectArticles("all",
+                                                       "#headlines-frame > div[id*=RROW]" +
+                                                       "[data-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]" +
+                                                       "[data-orig-feed-id='" + menu.callerRowId + "']");
+
+                                               catchupSelection();
+                                       }
+                               }));
+
+                               menu.addChild(new dijit.MenuItem({
+                                       label: __("Mark feed as read"),
+                                       onClick: function (event) {
+                                               catchupFeedInGroup(menu.callerRowId);
+                                       }
+                               }));
+
+                               menu.addChild(new dijit.MenuItem({
+                                       label: __("Edit feed"),
+                                       onClick: function (event) {
+                                               editFeed(menu.callerRowId);
+                                       }
+                               }));
+
+                               menu.startup();
+                       }
+               } else {
+                       var menu = dijit.byId("headlinesFeedTitleMenu");
 
+                       append_rows.each(function (row) {
+                               if (row.hasClassName("cdmFeedTitle")) {
+                                       menu.bindDomNode(row);
+                               }
+                       });
                }
 
        } catch (e) {
@@ -2315,7 +2352,7 @@ function updateFloatingTitle(unread_only) {
 function catchupCurrentBatchIfNeeded() {
        if (catchup_id_batch.length > 0) {
                window.clearTimeout(catchup_timeout_id);
-               catchup_timeout_id = window.setTimeout('catchupBatchedArticles()', 1000);
+               catchup_timeout_id = window.setTimeout(catchupBatchedArticles, 1000);
 
                if (catchup_id_batch.length >= 10) {
                        catchupBatchedArticles();