]> git.wh0rd.org - tt-rss.git/commitdiff
do some tweaks to prevent potential self-reading
authorAndrew Dolgov <fox@madoka.volgo-balt.ru>
Mon, 25 Mar 2013 10:01:33 +0000 (14:01 +0400)
committerAndrew Dolgov <fox@madoka.volgo-balt.ru>
Mon, 25 Mar 2013 10:01:33 +0000 (14:01 +0400)
js/viewfeed.js

index ece1f1394e08c3a7bb737a1fe8cb6ec5e1dec35a..485ee36063300a6851ebaa0895de870d1a679be7 100644 (file)
@@ -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 &&