rework feed-prefs ops toolbar

[tt-rss.git] / functions.js

diff --git a/functions.js b/functions.js
index d8f7a235c8eee12700c9634a62943bb5ecc7a74b..dab019c7108e77f941493106ced29594815a6cc0 100644 (file)
--- a/functions.js
+++ b/functions.js
@@ -934,7 +934,9 @@ function hideOrShowFeedsCategory(doc, node, hide, cat_node) {
        
                                if (hide && !has_unread) {
                                        //node.childNodes[i].style.display = "none";
-                                       Effect.Fade(node.childNodes[i], {duration : 0.3});
+                                       var id = node.childNodes[i].id;
+                                       Effect.Fade(node.childNodes[i], {duration : 0.3, 
+                                               queue: { position: 'end', scope: 'FFADE-' + id, limit: 1 }});
                                }
        
                                if (!hide) {
@@ -960,7 +962,8 @@ function hideOrShowFeedsCategory(doc, node, hide, cat_node) {
                }
                if (hide) {
                        //cat_node.style.display = "none";
-                       Effect.Fade(cat_node, {duration : 0.3});
+                       Effect.Fade(cat_node, {duration : 0.3, 
+                               queue: { position: 'end', scope: 'CFADE-' + i, limit: 1 }});
                } else {
                        cat_node.style.display = "list-item";
                }
@@ -1195,7 +1198,9 @@ function checkboxToggleElement(elem, id) {
 function appearBlockElement(id, h_id) {
 
        try {
-               Effect.Fade(h_id);
+               if (h_id) {
+                       Effect.Fade(h_id);
+               }
                Effect.SlideDown(id, {duration : 1.0, afterFinish: appearBlockElement_afh});
        } catch (e) {
                exception_error("appearBlockElement", e);
@@ -1203,7 +1208,6 @@ function appearBlockElement(id, h_id) {
 
 }
 
-
 function hideParentElement(e) {
        e.parentNode.style.display = "none";
 }
@@ -1687,3 +1691,30 @@ function labelTest() {
        }
 }
 
+function isCdmMode() {
+       return !document.getElementById("headlinesList");
+}
+
+function getSelectedArticleIds2() {
+       var rows = new Array();
+       var cdm_mode = isCdmMode();
+
+       if (cdm_mode) {
+               rows = cdmGetSelectedArticles();
+       } else {        
+               rows = getSelectedTableRowIds("headlinesList", "RROW", "RCHK");
+       }
+
+       var ids = new Array();
+
+       for (var i = 0; i < rows.length; i++) {
+               var chk = document.getElementById("RCHK-" + rows[i]);
+               if (chk && chk.checked) {
+                       ids.push(rows[i]);
+               }
+       }
+
+       return ids;
+}
+
+