From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 4 Aug 2011 11:53:07 +0000 (+0400)
Subject: do not schedule catchup batch request when infscroll request is in progress
X-Git-Tag: 1.5.6~62
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=956cca2a2a057e2a835118490434b49cca3f6c53;p=tt-rss.git

do not schedule catchup batch request when infscroll request is in progress
---

diff --git a/viewfeed.js b/viewfeed.js
index df96f9d1..3522284d 100644
--- a/viewfeed.js
+++ b/viewfeed.js
@@ -1375,7 +1375,7 @@ function headlines_scroll_handler(e) {
 					}
 				});
 
-			if (catchup_id_batch.length > 0) {
+			if (catchup_id_batch.length > 0 && !_infscroll_request_sent) {
 				window.clearTimeout(catchup_timeout_id);
 				catchup_timeout_id = window.setTimeout('catchupBatchedArticles()',
 						1000);