implement workaround for missing autoloaded headlines for adaptive & unread modes...

diff --git a/feedlist.js b/feedlist.js
index 954a67c162a7badd6cfdd9081f6f51a4ad3345b7..fe4ab897ecf3fc38e648d69de8c932341657dc51 100644 (file)
--- a/feedlist.js
+++ b/feedlist.js
@@ -1,4 +1,4 @@
-var _feed_cur_page = 0;
+//var _feed_cur_page = 0;
 var _infscroll_disable = 0;
 var _infscroll_request_sent = 0;
 var _search_query = false;
@@ -13,13 +13,34 @@ function viewCategory(cat) {
        return false;
 }
 
-function viewNextFeedPage() {
+function loadMoreHeadlines() {
        try {
-               //if (!getActiveFeedId()) return;
-
-               console.log("viewNextFeedPage: calling viewfeed(), p: " + parseInt(_feed_cur_page+1));
+               var offset = 0;
+
+               var view_mode = document.forms["main_toolbar_form"].view_mode.value;
+               var num_unread = $$("#headlines-frame > div[id*=RROW][class*=Unread]").length;
+               var num_all = $$("#headlines-frame > div[id*=RROW]").length;
+
+               // TODO implement marked & published
+
+               if (view_mode == "marked") {
+                       console.warn("loadMoreHeadlines: marked is not implemented, falling back.");
+                       offset = num_all;
+               } else if (view_mode == "published") {
+                       console.warn("loadMoreHeadlines: published is not implemented, falling back.");
+                       offset = num_all;
+               } else if (view_mode == "unread") {
+                       offset = num_unread;
+               } else if (view_mode == "adaptive") {
+                       if (num_unread > 0)
+                               offset = num_unread;
+                       else
+                               offset = num_all;
+               } else {
+                       offset = num_all;
+               }
 
-               viewfeed(getActiveFeedId(), '', activeFeedIsCat(), parseInt(_feed_cur_page+1));
+               viewfeed(getActiveFeedId(), '', activeFeedIsCat(), offset);
 
        } catch (e) {
                exception_error("viewNextFeedPage", e);
@@ -31,51 +52,30 @@ function viewfeed(feed, subop, is_cat, offset) {
        try {
                if (is_cat == undefined) is_cat = false;
                if (subop == undefined) subop = '';
-
-//             if (!offset) page_offset = 0;
+               if (offset == undefined) offset = 0;
 
                last_requested_article = 0;
-               //counters_last_request = 0;
 
                if (feed == getActiveFeedId()) {
                        cache_invalidate("F:" + feed);
                }
 
-/*             if (getInitParam("theme") == "" || getInitParam("theme") == "compact") {
-                       if (getInitParam("hide_feedlist") == 1) {
-                               Element.hide("feeds-holder");
-                       }
-               } */
-
                dijit.byId("content-tabs").selectChild(
                        dijit.byId("content-tabs").getChildren()[0]);
 
                var force_nocache = false;
 
-               var page_offset = 0;
-
-               if (offset > 0) {
-                       page_offset = offset;
-               } else {
-                       page_offset = 0;
-                       _feed_cur_page = 0;
-                       _infscroll_disable = 0;
-               }
-
-               if (getActiveFeedId() != feed) {
-                       _feed_cur_page = 0;
+               if (getActiveFeedId() != feed || offset == 0) {
                        active_post_id = 0;
                        _infscroll_disable = 0;
                }
 
-               if (page_offset != 0 && !subop) {
+               if (offset != 0 && !subop) {
                        var date = new Date();
                        var timestamp = Math.round(date.getTime() / 1000);
 
-                       console.log(_infscroll_request_sent + " : " + timestamp);
-
                        if (_infscroll_request_sent && _infscroll_request_sent + 30 > timestamp) {
-                               console.log("infscroll request in progress, aborting");
+                               //console.log("infscroll request in progress, aborting");
                                return;
                        }
 
@@ -105,8 +105,6 @@ function viewfeed(feed, subop, is_cat, offset) {
                        _search_query = false;
                }
 
-//             console.log("IS_CAT_STORED: " + activeFeedIsCat() + ", IS_CAT: " + is_cat);
-
                if (subop == "MarkAllRead") {
 
                        var show_next_feed = getInitParam("on_catchup_show_next_feed") == "1";
@@ -127,8 +125,8 @@ function viewfeed(feed, subop, is_cat, offset) {
                        query = query + "&cat=1";
                }
 
-               if (page_offset != 0) {
-                       query = query + "&skip=" + page_offset;
+               if (offset != 0) {
+                       query = query + "&skip=" + offset;
 
                        // to prevent duplicate feed titles when showing grouped vfeeds
                        if (vgroup_last_feed) {
@@ -140,52 +138,19 @@ function viewfeed(feed, subop, is_cat, offset) {
 
                console.log(query);
 
-/*             var unread_ctr = -1;
-
-               if (!is_cat) unread_ctr = getFeedUnread(feed);
-
-               var cache_check = false;
-
-               if (unread_ctr != -1 && !page_offset && !force_nocache && !subop) {
-
-                       var cache_prefix = "";
-
-                       if (is_cat) {
-                               cache_prefix = "C:";
-                       } else {
-                               cache_prefix = "F:";
-                       }
-
-                       cache_check = cache_check_param(cache_prefix + feed, unread_ctr);
-                       console.log("headline cache check: " + cache_check);
-               }
-
-               if (cache_check) {
-
-                       setActiveFeedId(feed, is_cat);
-
-                       $("headlines-frame").innerHTML = cache_find_param(cache_prefix + feed,
-                               unread_ctr);
-
-                       request_counters();
-                       remove_splash();
-
-               } else { */
-
-                       if (!is_cat) {
-                               if (!setFeedExpandoIcon(feed, is_cat, 'images/indicator_white.gif'))
-                                       notify_progress("Loading, please wait...", true);
-                       } else {
+               if (!is_cat) {
+                       if (!setFeedExpandoIcon(feed, is_cat, 'images/indicator_white.gif'))
                                notify_progress("Loading, please wait...", true);
-                       }
+               } else {
+                       notify_progress("Loading, please wait...", true);
+               }
 
-                       new Ajax.Request("backend.php", {
-                               parameters: query,
-                               onComplete: function(transport) {
-                                       setFeedExpandoIcon(feed, is_cat, 'images/blank_icon.gif');
-                                       headlines_callback2(transport, page_offset);
-                               } });
-//             }
+               new Ajax.Request("backend.php", {
+                       parameters: query,
+                       onComplete: function(transport) {
+                               setFeedExpandoIcon(feed, is_cat, 'images/blank_icon.gif');
+                               headlines_callback2(transport, offset);
+                       } });
 
        } catch (e) {
                exception_error("viewfeed", e);

diff --git a/functions.php b/functions.php
index 21693c5002ec51bed17b9e47d01d25e2509e1043..7c5916a1aa4a534b2f88208df6eecb9001635184 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -4944,10 +4944,7 @@
 
                $topmost_article_ids = array();
 
-               if (!$offset) {
-                       $offset = 0;
-               }
-
+               if (!$offset) $offset = 0;
                if ($subop == "undefined") $subop = "";
 
                $subop_split = explode(":", $subop);
@@ -5024,12 +5021,12 @@
                        $match_on = "both";
                }
 
-               $real_offset = $offset * $limit;
+               //$real_offset = $offset * $limit;
 
                if ($_REQUEST["debug"]) $timing_info = print_checkpoint("H0", $timing_info);
 
                $qfh_ret = queryFeedHeadlines($link, $feed, $limit, $view_mode, $cat_view,
-                       $search, $search_mode, $match_on, $override_order, $real_offset);
+                       $search, $search_mode, $match_on, $override_order, $offset);
 
                if ($_REQUEST["debug"]) $timing_info = print_checkpoint("H1", $timing_info);
 
@@ -5055,7 +5052,7 @@
 
                if (db_num_rows($result) > 0) {
 
-                       $lnum = $limit*$offset;
+                       $lnum = $offset+1;
 
                        $num_unread = 0;
                        $cur_feed_title = '';
@@ -5532,13 +5529,6 @@
                        }
                }
 
-#              if (!$offset) {
-#                      if ($headlines_count > 0) print "</div>";
-#                      print "</div>";
-#              }
-
-               #print "]]></content>";
-
                return array($topmost_article_ids, $headlines_count, $feed, $disable_cache,
                        $vgroup_last_feed, $reply['content'], $reply['toolbar']);
        }

diff --git a/viewfeed.js b/viewfeed.js
index ed3b897e67a51969d0247ad9ddf7c711c7bce647..df96f9d12920470b573796326e0a40569e33a152 100644 (file)
--- a/viewfeed.js
+++ b/viewfeed.js
@@ -17,13 +17,13 @@ var cache_added = [];
 var catchup_id_batch = [];
 var catchup_timeout_id = false;
 
-function headlines_callback2(transport, feed_cur_page) {
+function headlines_callback2(transport, offset) {
        try {
                handle_rpc_json(transport);
 
                loading_set_progress(25);
 
-               console.log("headlines_callback2 [page=" + feed_cur_page + "]");
+               console.log("headlines_callback2 [offset=" + offset + "]");
 
                var is_cat = false;
                var feed_id = false;
@@ -48,7 +48,7 @@ function headlines_callback2(transport, feed_cur_page) {
                        update_btn.disabled = !(feed_id >= 0 && !is_cat);
 
                        try {
-                               if (feed_cur_page == 0) {
+                               if (offset == 0) {
                                        $("headlines-frame").scrollTop = 0;
                                }
                        } catch (e) { };
@@ -68,7 +68,7 @@ function headlines_callback2(transport, feed_cur_page) {
                        var articles = reply['articles'];
                        var runtime_info = reply['runtime-info'];
 
-                       if (feed_cur_page == 0) {
+                       if (offset == 0) {
                                dijit.byId("headlines-frame").attr('content',
                                        reply['headlines']['content']);
 
@@ -78,9 +78,9 @@ function headlines_callback2(transport, feed_cur_page) {
                                var hsp = $("headlines-spacer");
                                if (!hsp) hsp = new Element("DIV", {"id": "headlines-spacer"});
 
-                               if (!_infscroll_disable)
+/*                             if (!_infscroll_disable)
                                        hsp.innerHTML = "<img src='images/indicator_tiny.gif'> " +
-                                               __("Loading, please wait...");
+                                               __("Loading, please wait..."); */
 
                                dijit.byId('headlines-frame').domNode.appendChild(hsp);
 
@@ -107,9 +107,11 @@ function headlines_callback2(transport, feed_cur_page) {
 
                                        if (!hsp) hsp = new Element("DIV", {"id": "headlines-spacer"});
 
-                                       if (!_infscroll_disable)
+/*                                     if (!_infscroll_disable)
                                                hsp.innerHTML = "<img src='images/indicator_tiny.gif'> " +
-                                                       __("Loading, please wait...");
+                                                       __("Loading, please wait..."); */
+
+                                       fixHeadlinesOrder(getLoadedArticleIds());
 
                                        c.domNode.appendChild(hsp);
 
@@ -156,7 +158,7 @@ function headlines_callback2(transport, feed_cur_page) {
                                        __('Could not update headlines (invalid object received)') + "</div>");
                }
 
-               _feed_cur_page = feed_cur_page;
+               //_feed_cur_page = feed_cur_page;
                _infscroll_request_sent = 0;
 
                notify("");
@@ -1274,7 +1276,7 @@ function preloadBatchedArticles() {
                                        var id = articles[i]['id'];
                                        if (!cache_check(id)) {
                                                cache_inject(id, articles[i]['content']);
-                                               console.log("preloaded article: " + id);
+                                               //console.log("preloaded article: " + id);
                                        }
                                }
                } });
@@ -1290,7 +1292,7 @@ function preloadArticleUnderPointer(id) {
 
                if (post_under_pointer == id && !cache_check(id)) {
 
-                       console.log("trying to preload article " + id);
+                       //console.log("trying to preload article " + id);
 
                        var neighbor_ids = getRelativePostIds(id, 1);
 
@@ -1348,7 +1350,12 @@ function headlines_scroll_handler(e) {
                        if (hsp && (e.scrollTop + e.offsetHeight > hsp.offsetTop) ||
                                        e.scrollTop + e.offsetHeight > e.scrollHeight - 100) {
 
-                               viewNextFeedPage();
+                               hsp.innerHTML = "<img src='images/indicator_tiny.gif'> " +
+                                       __("Loading, please wait...");
+
+                               loadMoreHeadlines();
+
+                               //viewNextFeedPage();
                        }
                } else {
                        if (hsp) hsp.innerHTML = "";