From: Andrew Dolgov <noreply@fakecake.org>
Date: Fri, 25 Jul 2014 05:20:00 +0000 (+0400)
Subject: Revert "scroll to end to show next feed or category"
X-Git-Tag: 1.14~58
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=6472dd11a2b7d00421a2c3fa93f7de4fcbc88832;p=tt-rss.git

Revert "scroll to end to show next feed or category"

This reverts commit 86f32020f6a06af52eb226bf95c6515cb2537663.
---

diff --git a/js/viewfeed.js b/js/viewfeed.js
index a786904e..9672c47b 100644
--- a/js/viewfeed.js
+++ b/js/viewfeed.js
@@ -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);