rework infinite scroll request synchronization

1 files changed, 15 insertions, 1 deletions

diff --git a/feedlist.js b/feedlist.js
index a8c1cd5c8..774c4d2e2 100644
--- a/feedlist.js
+++ b/feedlist.js
@@ -1,5 +1,6 @@
 var _feed_cur_page = 0;
 var _infscroll_disable = 0;
+var _infscroll_request_sent = 0;
 
 function viewCategory(cat) {
 	active_feed_is_cat = true;
@@ -53,6 +54,20 @@ function viewfeed(feed, subop, is_cat, subop_param, skip_history, offset) {
 			_infscroll_disable = 0;
 		}
 
+		if (page_offset != 0 && !subop) {
+			var date = new Date();
+			var timestamp = Math.round(date.getTime() / 1000);
+
+			debug("<b>" + _infscroll_request_sent + " : " + timestamp + "</b>");
+
+			if (_infscroll_request_sent && _infscroll_request_sent + 30 > timestamp) {
+				debug("infscroll request in progress, aborting");
+				return;
+			}
+
+			_infscroll_request_sent = timestamp;			
+		}
+
 		enableHotkeys();
 
 		closeInfoBox();
@@ -134,7 +149,6 @@ function viewfeed(feed, subop, is_cat, subop_param, skip_history, offset) {
 		}
 
 		new Ajax.Request(query, {
-			asynchronous: page_offset == 0,
 			onComplete: function(transport) { 
 				headlines_callback2(transport, feed, is_cat, page_offset); 
 			} });