experimental fix for the infamous mail auto-reading feature reported by Mark Waters

diff --git a/feedlist.js b/feedlist.js
index d8dc551d8a180e3caba12d6930c176f080819f6e..1c2adc887906689ae5714e9bbb81174019f1d55d 100644 (file)
--- a/feedlist.js
+++ b/feedlist.js
@@ -40,7 +40,7 @@ function loadMoreHeadlines() {
                        offset = num_all;
                }
 
-               viewfeed(getActiveFeedId(), '', activeFeedIsCat(), offset);
+               viewfeed(getActiveFeedId(), '', activeFeedIsCat(), offset, false, true);
 
        } catch (e) {
                exception_error("viewNextFeedPage", e);
@@ -48,7 +48,7 @@ function loadMoreHeadlines() {
 }
 
 
-function viewfeed(feed, subop, is_cat, offset, background) {
+function viewfeed(feed, subop, is_cat, offset, background, infscrol_req) {
        try {
                if (is_cat == undefined)
                        is_cat = false;
@@ -58,6 +58,7 @@ function viewfeed(feed, subop, is_cat, offset, background) {
                if (subop == undefined) subop = '';
                if (offset == undefined) offset = 0;
                if (background == undefined) background = false;
+               if (infscrol_req == undefined) infscrol_req = false;
 
                last_requested_article = 0;
 
@@ -179,7 +180,7 @@ function viewfeed(feed, subop, is_cat, offset, background) {
                        parameters: query,
                        onComplete: function(transport) {
                                setFeedExpandoIcon(feed, is_cat, 'images/blank_icon.gif');
-                               headlines_callback2(transport, offset, background);
+                               headlines_callback2(transport, offset, background, infscrol_req);
                        } });
 
        } catch (e) {

diff --git a/viewfeed.js b/viewfeed.js
index 55f61487561e6532f94aa18bc0c58387af559fb5..cef9fb045142a201e9451f48800f27def54aabc0 100644 (file)
--- a/viewfeed.js
+++ b/viewfeed.js
@@ -16,13 +16,13 @@ var cids_requested = [];
 
 var has_storage = 'sessionStorage' in window && window['sessionStorage'] !== null;
 
-function headlines_callback2(transport, offset, background) {
+function headlines_callback2(transport, offset, background, infscroll_req) {
        try {
                handle_rpc_json(transport);
 
                loading_set_progress(25);
 
-               console.log("headlines_callback2 [offset=" + offset + "] B:" + background);
+               console.log("headlines_callback2 [offset=" + offset + "] B:" + background + " I:" + infscroll_req);
 
                var is_cat = false;
                var feed_id = false;
@@ -54,7 +54,7 @@ function headlines_callback2(transport, offset, background) {
                        setActiveFeedId(feed_id, is_cat);
 
                        try {
-                               if (offset == 0) {
+                               if (offset == 0 && infscroll_req == false) {
                                        $("headlines-frame").scrollTop = 0;
                                }
                        } catch (e) { };
@@ -73,7 +73,7 @@ function headlines_callback2(transport, offset, background) {
                        var articles = reply['articles'];
                        var runtime_info = reply['runtime-info'];
 
-                       if (offset == 0) {
+                       if (offset == 0 && infscroll_req == false) {
                                dijit.byId("headlines-frame").attr('content',
                                        reply['headlines']['content']);