cleanup dismissArticle functions

diff --git a/js/feedlist.js b/js/feedlist.js
index 475904efadacb14df6596bbef7420e1e17e8bef1..d74c1363131ebb3a9f74c8febaba69649d2f6a93 100644 (file)
--- a/js/feedlist.js
+++ b/js/feedlist.js
@@ -451,8 +451,8 @@ function catchupFeedInGroup(id) {
                        if (rows.length > 0) {
 
                                rows.each(function (row) {
-                                       new Effect.Fade(row, {duration : 0.5, afterFinish: function() {
-                                               Element.remove(row);
+                                       new Effect.Fade(row, {duration : 0.5, afterFinish: function(obj) {
+                                               Element.remove(obj.element);
                                        }});
                                });
 

diff --git a/js/viewfeed.js b/js/viewfeed.js
index 9bf8e93557468555e0633545bd355dd0274d61ea..bd0e0690be528f96b27a8a4ef168638ba69d3c95 100755 (executable)
--- a/js/viewfeed.js
+++ b/js/viewfeed.js
@@ -552,7 +552,7 @@ function moveToPost(mode, noscroll, noexpand) {
 
        try {
 
-               var rows = getVisibleArticleIds();
+               var rows = getLoadedArticleIds();
 
                var prev_id = false;
                var next_id = false;
@@ -693,17 +693,6 @@ 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 {
 
@@ -1428,7 +1417,7 @@ function catchupRelativeToArticle(below, id) {
                        return;
                }
 
-               var visible_ids = getVisibleArticleIds();
+               var visible_ids = getLoadedArticleIds();
 
                var ids_to_mark = new Array();
 
@@ -1642,26 +1631,36 @@ function show_labels_in_headlines(transport) {
        }
 }
 
-function dismissArticle(id) {
+function dismissArticles(ids) {
        try {
-               var elem = $("RROW-" + id);
 
-               if (!elem) return;
+               console.log("dismissArticles: " + ids);
 
-               toggleUnread(id, 0, true);
+               for (var i = 0; i < ids.length; i++) {
+                       var elem = $("RROW-" + ids[i]);
 
-               new Effect.Fade(elem, {duration : 0.5});
+                       new Effect.Fade(elem, {
+                               duration: 0.5, afterFinish: function (obj) {
+                                       Element.remove(obj.element);
+                               }
+                       });
 
-               // Remove the content, too
-               var elem_content = $("CICD-" + id);
-               if (elem_content) {
-                       Element.remove(elem_content);
+                       if (ids[i] == getActiveArticleId()) {
+                               setActiveArticleId(0);
+                       }
                }
 
-               if (id == getActiveArticleId()) {
-                       setActiveArticleId(0);
-               }
+               selectionToggleUnread(false, false, false, ids);
+
+       } catch (e) {
+               exception_error("dismissArticles", e);
+       }
+
+}
 
+function dismissArticle(id) {
+       try {
+               dismissArticles([id]);
        } catch (e) {
                exception_error("dismissArticle", e);
        }
@@ -1669,33 +1668,7 @@ function dismissArticle(id) {
 
 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);
-
-
+               dismissArticles(getSelectedArticleIds2());
        } catch (e) {
                exception_error("dismissSelectedArticles", e);
        }
@@ -1703,52 +1676,23 @@ function dismissSelectedArticles() {
 
 function dismissReadArticles() {
        try {
-
-               var ids = getVisibleArticleIds();
+               var ids = getLoadedArticleIds();
                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});
+               ids.each(function(id) {
+                       var elem = $("RROW-" + id);
 
-                               // Remove the content, too
-                               var elem_content = $("CICD-" + ids[i]);
-                               if (elem_content) {
-                                       Element.remove(elem_content);
-                               }
-                       } else {
-                               tmp.push(ids[i]);
+                       if (elem && !elem.hasClassName("Unread")) {
+                               tmp.push(id);
                        }
-               }
 
-       } 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);
-                       });
+               dismissArticles(tmp);
 
        } catch (e) {
-               exception_error("getVisibleArticleIds", e);
+               exception_error("dismissReadArticles", e);
        }
-
-       return ids; */
 }
 
 function cdmClicked(event, id) {
@@ -1839,17 +1783,6 @@ 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);
@@ -1886,7 +1819,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) {