]> git.wh0rd.org Git - tt-rss.git/commitdiff
Revert "scroll to end to show next feed or category"
authorAndrew Dolgov <noreply@fakecake.org>
Fri, 25 Jul 2014 05:20:00 +0000 (09:20 +0400)
committerAndrew Dolgov <noreply@fakecake.org>
Fri, 25 Jul 2014 05:20:00 +0000 (09:20 +0400)
This reverts commit 86f32020f6a06af52eb226bf95c6515cb2537663.

js/viewfeed.js

index a786904e39d48859b8f0cf3d925435a294cb35e1..9672c47ba6acdebbf5998d6f8b5fdc34992f0c67 100644 (file)
@@ -8,7 +8,6 @@ var post_under_pointer = false;
 var last_requested_article = false;
 
 var catchup_id_batch = [];
-var catchup_go_next = false;
 var catchup_timeout_id = false;
 
 var cids_requested = [];
@@ -1329,8 +1328,6 @@ function headlines_scroll_handler(e) {
                        var ts = new Date().getTime();
                        if (ts - _last_headlines_update < 100) return;
 
-                       var atend = true;
-
                        $$("#headlines-frame > div[id*=RROW][class*=Unread]").each(
                                function(child) {
                                        if (child.hasClassName("Unread") && $("headlines-frame").scrollTop >
@@ -1342,18 +1339,10 @@ function headlines_scroll_handler(e) {
                                                        catchup_id_batch.push(id);
 
                                                //console.log("auto_catchup_batch: " + catchup_id_batch.toString());
-                                       } else {
-                                               atend = false;
                                        }
 
                                });
 
-                       if (atend) {
-                               if (getInitParam("on_catchup_show_next_feed") == "1") {
-                                       catchup_go_next = true;
-                               }
-                       }
-
                        if (catchup_id_batch.length > 0) {
                                window.clearTimeout(catchup_timeout_id);
 
@@ -1399,12 +1388,6 @@ function catchupBatchedArticles() {
 
                                } });
                }
-               if (catchup_go_next) {
-                       catchup_go_next = false;
-                       var is_cat = activeFeedIsCat();
-                       var nuf = getNextUnreadFeed(getActiveFeedId(), is_cat);
-                       if (nuf) viewfeed(nuf, '', is_cat);
-               }
 
        } catch (e) {
                exception_error("catchupBatchedArticles", e);