From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Mon, 25 Mar 2013 10:01:33 +0000 (+0400)
Subject: do some tweaks to prevent potential self-reading
X-Git-Tag: 1.7.6~307
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=62b1f587ab6452136f6fe914d2d7545b43ffe5a8;p=tt-rss.git

do some tweaks to prevent potential self-reading
---

diff --git a/js/viewfeed.js b/js/viewfeed.js
index ece1f139..485ee360 100644
--- a/js/viewfeed.js
+++ b/js/viewfeed.js
@@ -205,7 +205,7 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
 
 		_infscroll_request_sent = 0;
 
-		headlines_scroll_handler($("headlines-frame"));
+		unpackVisibleHeadlines();
 
 		notify("");
 
@@ -315,7 +315,7 @@ function article_callback2(transport, id) {
 		var unread_in_buffer = $$("#headlines-frame > div[id*=RROW][class*=Unread]").length
 		request_counters(unread_in_buffer == 0);
 
-		headlines_scroll_handler($("headlines-frame"));
+		//headlines_scroll_handler($("headlines-frame"));
 
 /*		try {
 			if (!_infscroll_disable &&
@@ -397,7 +397,7 @@ function view(id) {
 					console.warn(e);
 				} */
 
-				headlines_scroll_handler($("headlines-frame"));
+				//headlines_scroll_handler($("headlines-frame"));
 
 				return;
 			}
@@ -1174,9 +1174,8 @@ function postMouseOut(id) {
 	post_under_pointer = false;
 }
 
-function headlines_scroll_handler(e) {
+function unpackVisibleHeadlines() {
 	try {
-		var hsp = $("headlines-spacer");
 
 		$$("#headlines-frame > div[id*=RROW]").each(
 			function(child) {
@@ -1195,6 +1194,17 @@ function headlines_scroll_handler(e) {
 		);
 
 
+	} catch (e) {
+		exception_error("unpackVisibleHeadlines", e);
+	}
+}
+
+function headlines_scroll_handler(e) {
+	try {
+		var hsp = $("headlines-spacer");
+
+		unpackVisibleHeadlines();
+
 		if (!_infscroll_disable) {
 			if ((hsp && e.scrollTop + e.offsetHeight >= hsp.offsetTop - hsp.offsetHeight) ||
 					(e.scrollHeight != 0 &&