From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Sat, 13 Nov 2010 23:12:24 +0000 (+0300)
Subject: do not enable infscroll when number of loaded headlines is less than headline limit
X-Git-Tag: 1.5.0~229
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=7d12b6c8beed490baa211066f69479d98cafbe9f;p=tt-rss.git

do not enable infscroll when number of loaded headlines is less than headline limit
---

diff --git a/functions.php b/functions.php
index 572ecf10..00d2dcf2 100644
--- a/functions.php
+++ b/functions.php
@@ -3153,7 +3153,7 @@
 
 		foreach (array("ON_CATCHUP_SHOW_NEXT_FEED", "HIDE_READ_FEEDS",
 			"ENABLE_FEED_CATS", "FEEDS_SORT_BY_UNREAD", "CONFIRM_FEED_CATCHUP",
-			"CDM_AUTO_CATCHUP", "FRESH_ARTICLE_MAX_AGE", 
+			"CDM_AUTO_CATCHUP", "FRESH_ARTICLE_MAX_AGE", "DEFAULT_ARTICLE_LIMIT",
 			"HIDE_READ_SHOWS_SPECIAL", "HIDE_FEEDLIST", "COMBINED_DISPLAY_MODE") as $param) {
 
 				 $params[strtolower($param)] = (int) get_pref($link, $param);
diff --git a/viewfeed.js b/viewfeed.js
index f06c9944..fff40375 100644
--- a/viewfeed.js
+++ b/viewfeed.js
@@ -112,7 +112,7 @@ function headlines_callback2(transport, feed_cur_page) {
 			
 			vgroup_last_feed = headlines_info.vgroup_last_feed;
 
-			if (headlines_count == 0) {
+			if (parseInt(headlines_count) < getInitParam("default_article_limit")) {
 				_infscroll_disable = 1;
 			} else {
 				_infscroll_disable = 0;