Replace all setTimeout strings with functions

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

diff --git a/js/feedlist.js b/js/feedlist.js
index 475904efadacb14df6596bbef7420e1e17e8bef1..e66a0c1b6a8017bd7fa7f0b589ad7b61573f70de 100644 (file)
--- a/js/feedlist.js
+++ b/js/feedlist.js
@@ -102,6 +102,7 @@ function viewfeed(params) {
                                _infscroll_disable = 0;
 
                                cleanup_memory("headlines-frame");
+                               _headlines_scroll_offset = 0;
                        }
 
                        if (infscroll_req) {
@@ -197,7 +198,7 @@ function feedlist_init() {
                loading_set_progress(50);
 
                document.onkeydown = hotkey_handler;
-               setTimeout("hotkey_prefix_timeout()", 5*1000);
+               setTimeout(hotkey_prefix_timeout, 5*1000);
 
                if (!getActiveFeedId()) {
                        viewfeed({feed: -3});
@@ -446,19 +447,31 @@ function catchupFeedInGroup(id) {
 
                if (getInitParam("confirm_feed_catchup") != 1 || confirm(str)) {
 
-                       var rows = $$("#headlines-frame > div[id*=RROW][orig-feed-id='"+id+"']");
+                       var rows = $$("#headlines-frame > div[id*=RROW][data-orig-feed-id='"+id+"']");
 
                        if (rows.length > 0) {
 
                                rows.each(function (row) {
-                                       new Effect.Fade(row, {duration : 0.5, afterFinish: function() {
-                                               Element.remove(row);
-                                       }});
+                                       row.removeClassName("Unread");
+
+                                       if (row.getAttribute("data-article-id") != getActiveArticleId()) {
+                                               new Effect.Fade(row, {duration: 0.5});
+                                       }
+
                                });
 
-                               var feedTitle = $("FTITLE-" + id);
+                               var feedTitles = $$("#headlines-frame > div[class='cdmFeedTitle']");
+
+                               for (var i = 0; i < feedTitles.length; i++) {
+                                       if (feedTitles[i].getAttribute("data-feed-id") == id) {
 
-                               if (feedTitle) new Effect.Fade(feedTitle, {duration : 0.5});
+                                               if (i < feedTitles.length - 1) {
+                                                       new Effect.Fade(feedTitles[i], {duration: 0.5});
+                                               }
+
+                                               break;
+                                       }
+                               }
 
                                updateFloatingTitle(true);
                        }