]> git.wh0rd.org - tt-rss.git/blobdiff - feedlist.js
misc typo fixes
[tt-rss.git] / feedlist.js
index f3332477be2ed58a18c9c3332af3a3723f1b890e..c117b66e9b1b878d34861bea2692c5358d7afcfb 100644 (file)
@@ -1,10 +1,9 @@
-var _feed_cur_page = 0;
 var _infscroll_disable = 0;
 var _infscroll_request_sent = 0;
+var _search_query = false;
 
 var counter_timeout_id = false;
 
-var resize_enabled = false;
 var counters_last_request = 0;
 
 function viewCategory(cat) {
@@ -12,13 +11,36 @@ function viewCategory(cat) {
        return false;
 }
 
-function viewNextFeedPage() {
+function loadMoreHeadlines() {
        try {
-               //if (!getActiveFeedId()) return;
-
-               console.log("viewNextFeedPage: calling viewfeed(), p: " + parseInt(_feed_cur_page+1));
+               console.log("loadMoreHeadlines");
+
+               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, false, true);
 
        } catch (e) {
                exception_error("viewNextFeedPage", e);
@@ -26,190 +48,195 @@ function viewNextFeedPage() {
 }
 
 
-function viewfeed(feed, subop, is_cat, offset) {
+function viewfeed(feed, subop, is_cat, offset, background, infscrol_req) {
        try {
-               if (is_cat == undefined) is_cat = false;
+               if (is_cat == undefined)
+                       is_cat = false;
+               else
+                       is_cat = !!is_cat;
 
-//             if (!offset) page_offset = 0;
+               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;
-               //counters_last_request = 0;
+
+               var cached_headlines = false;
 
                if (feed == getActiveFeedId()) {
-                       cache_invalidate("F:" + feed);
-               }
+                       cache_delete("feed:" + feed + ":" + is_cat);
+               } else {
+                       cached_headlines = cache_get("feed:" + feed + ":" + is_cat);
 
-/*             if (getInitParam("theme") == "" || getInitParam("theme") == "compact") {
-                       if (getInitParam("hide_feedlist") == 1) {
-                               Element.hide("feeds-holder");
-                       }               
-               } */
+                       // switching to a different feed, we might as well catchup stuff visible
+                       // in headlines buffer (if any)
+                       if (!background && getInitParam("cdm_auto_catchup") == 1 && parseInt(getActiveFeedId()) > 0) {
 
-               dijit.byId("content-tabs").selectChild(
-                       dijit.byId("content-tabs").getChildren()[0]);
+                               $$("#headlines-frame > div[id*=RROW][class*=Unread]").each(
+                                       function(child) {
+                                               var hf = $("headlines-frame");
 
-               var force_nocache = false;
+                                               if (hf.scrollTop + hf.offsetHeight >=
+                                                               child.offsetTop + child.offsetHeight) {
 
-               var page_offset = 0;
+                                                       var id = child.id.replace("RROW-", "");
 
-               if (offset > 0) {
-                       page_offset = offset;
-               } else {
-                       page_offset = 0;
-                       _feed_cur_page = 0;
-                       _infscroll_disable = 0;
-               }
+                                                       if (catchup_id_batch.indexOf(id) == -1)
+                                                               catchup_id_batch.push(id);
 
-               if (getActiveFeedId() != feed) {
-                       _feed_cur_page = 0;
-                       active_post_id = 0;
-                       _infscroll_disable = 0;
-               }
+                                               }
 
-               if (page_offset != 0 && !subop) {
-                       var date = new Date();
-                       var timestamp = Math.round(date.getTime() / 1000);
+                                               if (catchup_id_batch.length > 0) {
+                                                       window.clearTimeout(catchup_timeout_id);
 
-                       console.log(_infscroll_request_sent + " : " + timestamp);
+                                                       if (!_infscroll_request_sent) {
+                                                               catchup_timeout_id = window.setTimeout('catchupBatchedArticles()',
+                                                                       2000);
+                                                       }
+                                               }
 
-                       if (_infscroll_request_sent && _infscroll_request_sent + 30 > timestamp) {
-                               console.log("infscroll request in progress, aborting");
-                               return;
+                                       });
                        }
-
-                       _infscroll_request_sent = timestamp;                    
                }
 
-               enableHotkeys();
-               hideAuxDlg();
-               closeInfoBox();
-
-               Form.enable("main_toolbar_form");
+               if (offset == 0)
+                       dijit.byId("content-tabs").selectChild(
+                               dijit.byId("content-tabs").getChildren()[0]);
 
-               var toolbar_form = document.forms["main_toolbar_form"];
-               var toolbar_query = Form.serialize("main_toolbar_form");
+               if (!background) {
+                       if (getActiveFeedId() != feed || offset == 0) {
+                               active_post_id = 0;
+                               _infscroll_disable = 0;
+                       }
 
-               if (toolbar_form.query) {
-                       if (toolbar_form.query.value != "") {
-                               force_nocache = true;
+                       if (!offset && !subop && cached_headlines && !background) {
+                               try {
+                                       render_local_headlines(feed, is_cat, JSON.parse(cached_headlines));
+                                       return;
+                               } catch (e) {
+                                       console.warn("render_local_headlines failed: " + e);
+                               }
                        }
-                       toolbar_form.query.value = "";
-               }
 
-               var query = "?op=viewfeed&feed=" + feed + "&" +
-                       toolbar_query + "&subop=" + param_escape(subop);
+                       if (offset != 0 && !subop) {
+                               var date = new Date();
+                               var timestamp = Math.round(date.getTime() / 1000);
+
+                               if (_infscroll_request_sent && _infscroll_request_sent + 30 > timestamp) {
+                                       //console.log("infscroll request in progress, aborting");
+                                       return;
+                               }
 
-               if ($("search_form")) {
-                       var search_query = Form.serialize("search_form");
-                       query = query + "&" + search_query;
-                       $("search_form").query.value = "";
-                       closeInfoBox(true);
-                       force_nocache = true;
+                               _infscroll_request_sent = timestamp;
+                       }
+
+                       hideAuxDlg();
                }
 
-//             console.log("IS_CAT_STORED: " + activeFeedIsCat() + ", IS_CAT: " + is_cat);
+               Form.enable("main_toolbar_form");
 
-               if (subop == "MarkAllRead") {
+               var toolbar_query = Form.serialize("main_toolbar_form");
 
-                       var show_next_feed = getInitParam("on_catchup_show_next_feed") == "1";
+               var query = "?op=viewfeed&feed=" + feed + "&" +
+                       toolbar_query + "&subop=" + param_escape(subop);
 
-                       if (show_next_feed) {
-                               // TODO: implement show_next_feed handling
+               if (!background) {
+                       if (_search_query) {
+                               force_nocache = true;
+                               query = query + "&" + _search_query;
+                               _search_query = false;
                        }
-               }
 
-               if (is_cat) {
-                       query = query + "&cat=1";
-               }
+                       if (subop == "MarkAllRead") {
 
-               if (page_offset != 0) {
-                       query = query + "&skip=" + page_offset;
+                               var show_next_feed = getInitParam("on_catchup_show_next_feed") == "1";
 
-                       // to prevent duplicate feed titles when showing grouped vfeeds
-                       if (vgroup_last_feed) {
-                               query = query + "&vgrlf=" + param_escape(vgroup_last_feed);
-                       }
-               }
+                               if (show_next_feed) {
+                                       var nuf = getNextUnreadFeed(feed, is_cat);
 
-               Form.enable("main_toolbar_form");
+                                       if (nuf) {
+                                               var cached_nuf = cache_get("feed:" + nuf + ":false");
 
-               console.log(query);
+                                               if (cached_nuf) {
 
-               var container = $("headlinesInnerContainer");
+                                                       render_local_headlines(nuf, false, JSON.parse(cached_nuf));
 
-               var unread_ctr = -1;
-               
-               if (!is_cat) unread_ctr = getFeedUnread(feed);
+                                                       var catchup_query = "?op=rpc&subop=catchupFeed&feed_id=" +
+                                                               feed + "&is_cat=" + is_cat;
 
-               var cache_check = false;
+                                                       console.log(catchup_query);
 
-               if (unread_ctr != -1 && !page_offset && !force_nocache && !subop) {
+                                                       new Ajax.Request("backend.php", {
+                                                               parameters: catchup_query,
+                                                               onComplete: function(transport) {
+                                                                       handle_rpc_json(transport);
+                                                               } });
 
-                       var cache_prefix = "";
-                               
-                       if (is_cat) {
-                               cache_prefix = "C:";
-                       } else {
-                               cache_prefix = "F:";
+                                                       return;
+                                               } else {
+                                                       query += "&nuf=" + param_escape(nuf);
+                                               }
+                                       }
+                               }
                        }
 
-                       cache_check = cache_check_param(cache_prefix + feed, unread_ctr);
-                       console.log("headline cache check: " + cache_check);
-               }
+                       if (offset != 0) {
+                               query = query + "&skip=" + offset;
 
-               if (cache_check) {
+                               // to prevent duplicate feed titles when showing grouped vfeeds
+                               if (vgroup_last_feed) {
+                                       query = query + "&vgrlf=" + param_escape(vgroup_last_feed);
+                               }
+                       }
 
-                       setActiveFeedId(feed, is_cat);
-               
-                       $("headlines-frame").innerHTML = cache_find_param(cache_prefix + feed, 
-                               unread_ctr);
+                       Form.enable("main_toolbar_form");
 
-                       request_counters();
-                       remove_splash();
+                       if (!offset)
+                               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);
+                               }
+               }
 
-               } else {
+               query += "&cat=" + is_cat;
 
-                       if (!is_cat)
-                               if (!setFeedExpandoIcon(feed, is_cat, 'images/indicator_white.gif'))
-                                       notify_progress("Loading, please wait...", true);
+               console.log(query);
 
-                       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, background, infscrol_req);
+                       } });
 
        } catch (e) {
                exception_error("viewfeed", e);
-       }               
+       }
 }
 
 function feedlist_init() {
        try {
-               loading_set_progress(90);
-
                console.log("in feedlist init");
-               
+
                hideOrShowFeeds(getInitParam("hide_read_feeds") == 1);
                document.onkeydown = hotkey_handler;
                setTimeout("hotkey_prefix_timeout()", 5*1000);
 
                 if (!getActiveFeedId()) {
-                       if (getInitParam("cdm_auto_catchup") != 1) {
-                               setTimeout("viewfeed(-3)", 100);
-                       } else {
-                               setTimeout("viewfeed(-5)", 100);
-                               remove_splash();
-                       }
-               } 
+                       setTimeout("viewfeed(-3)", 100);
+               }
 
-               console.log("T:" + 
+               console.log("T:" +
                                getInitParam("cdm_auto_catchup") + " " + getFeedUnread(-3));
 
                hideOrShowFeeds(getInitParam("hide_read_feeds") == 1);
 
+               setTimeout("timeout()", 5000);
+               setTimeout("precache_headlines_idle()", 3000);
+
        } catch (e) {
                exception_error("feedlist/init", e);
        }
@@ -225,9 +252,9 @@ function request_counters_real() {
 
                new Ajax.Request("backend.php", {
                        parameters: query,
-                       onComplete: function(transport) { 
+                       onComplete: function(transport) {
                                try {
-                                       handle_rpc_reply(transport);
+                                       handle_rpc_json(transport);
                                } catch (e) {
                                        exception_error("viewfeed/getcounters", e);
                                }
@@ -267,7 +294,7 @@ function request_counters() {
 function displayNewContentPrompt(id) {
        try {
 
-               var msg = "<a href='#' onclick='viewfeed("+id+")'>" +
+               var msg = "<a href='#' onclick='viewCurrentFeed()'>" +
                        __("New articles available in this feed (click to show)") + "</a>";
 
                msg = msg.replace("%s", getFeedName(id));
@@ -281,23 +308,17 @@ function displayNewContentPrompt(id) {
        }
 }
 
-function parse_counters(reply, scheduled_call) {
+function parse_counters(elems, scheduled_call) {
        try {
-
-               var feeds_found = 0;
-
-               var elems = JSON.parse(reply.firstChild.nodeValue);
-
                for (var l = 0; l < elems.length; l++) {
 
-                       var id = elems[l].id
+                       var id = elems[l].id;
                        var kind = elems[l].kind;
-                       var ctr = parseInt(elems[l].counter)
+                       var ctr = parseInt(elems[l].counter);
                        var error = elems[l].error;
                        var has_img = elems[l].has_img;
                        var updated = elems[l].updated;
-                       var title = elems[l].title;
-       
+
                        if (id == "global-unread") {
                                global_unread = ctr;
                                updateTitle();
@@ -309,21 +330,25 @@ function parse_counters(reply, scheduled_call) {
                                continue;
                        }
 
-                       var treeItem;
+                       // TODO: enable new content notification for categories
 
-                       if (id == getActiveFeedId() && ctr > getFeedUnread(id) && scheduled_call) {
+                       if (!activeFeedIsCat() && id == getActiveFeedId()
+                                       && ctr > getFeedUnread(id) && scheduled_call) {
                                displayNewContentPrompt(id);
                        }
 
+                       if (getFeedUnread(id, (kind == "cat")) != ctr)
+                               cache_delete("feed:" + id + ":" + (kind == "cat"));
+
                        setFeedUnread(id, (kind == "cat"), ctr);
 
                        if (kind != "cat") {
-                               //setFeedValue(id, false, 'error', error);
+                               setFeedValue(id, false, 'error', error);
                                setFeedValue(id, false, 'updated', updated);
 
                                if (id > 0) {
                                        if (has_img) {
-                                               setFeedIcon(id, false, 
+                                               setFeedIcon(id, false,
                                                        getInitParam("icons_url") + "/" + id + ".ico");
                                        } else {
                                                setFeedIcon(id, false, 'images/blank_icon.gif');
@@ -331,19 +356,8 @@ function parse_counters(reply, scheduled_call) {
                                }
                        }
                }
-       
-               hideOrShowFeeds(getInitParam("hide_read_feeds") == 1);
 
-               var feeds_stored = number_of_feeds;
-
-               if (feeds_stored != feeds_found) {
-                       number_of_feeds = feeds_found;
-
-                       if (feeds_stored != 0 && feeds_found != 0) {
-                               console.log("Subscribed feed number changed, refreshing feedlist");
-                               setTimeout('updateFeedList()', 50);
-                       }
-               }
+               hideOrShowFeeds(getInitParam("hide_read_feeds") == 1);
 
        } catch (e) {
                exception_error("parse_counters", e);
@@ -354,7 +368,7 @@ function getFeedUnread(feed, is_cat) {
        try {
                var tree = dijit.byId("feedTree");
 
-               if (tree && tree.model) 
+               if (tree && tree.model)
                        return tree.model.getFeedUnread(feed, is_cat);
 
        } catch (e) {
@@ -375,20 +389,20 @@ function hideOrShowFeeds(hide) {
                return tree.hideRead(hide, getInitParam("hide_read_shows_special"));
 }
 
-function getFeedName(feed, is_cat) {   
+function getFeedName(feed, is_cat) {
        var tree = dijit.byId("feedTree");
 
-       if (tree && tree.model) 
+       if (tree && tree.model)
                return tree.model.getFeedValue(feed, is_cat, 'name');
 }
 
-function getFeedValue(feed, is_cat, key) {     
+function getFeedValue(feed, is_cat, key) {
        try {
                var tree = dijit.byId("feedTree");
 
-               if (tree && tree.model) 
+               if (tree && tree.model)
                        return tree.model.getFeedValue(feed, is_cat, key);
-       
+
        } catch (e) {
                //
        }
@@ -399,7 +413,7 @@ function setFeedUnread(feed, is_cat, unread) {
        try {
                var tree = dijit.byId("feedTree");
 
-               if (tree && tree.model) 
+               if (tree && tree.model)
                        return tree.model.setFeedUnread(feed, is_cat, unread);
 
        } catch (e) {
@@ -411,7 +425,7 @@ function setFeedValue(feed, is_cat, key, value) {
        try {
                var tree = dijit.byId("feedTree");
 
-               if (tree && tree.model) 
+               if (tree && tree.model)
                        return tree.model.setFeedValue(feed, is_cat, key, value);
 
        } catch (e) {
@@ -452,3 +466,44 @@ function setFeedExpandoIcon(feed, is_cat, src) {
        }
        return false;
 }
+
+function getNextUnreadFeed(feed, is_cat) {
+       try {
+               var tree = dijit.byId("feedTree");
+               var nuf = tree.model.getNextUnreadFeed(feed, is_cat);
+
+               if (nuf)
+                       return tree.model.store.getValue(nuf, 'bare_id');
+
+       } catch (e) {
+               exception_error("getNextUnreadFeed", e);
+       }
+}
+
+function catchupFeed(feed, is_cat) {
+       try {
+               var str = __("Mark all articles in %s as read?");
+               var fn = getFeedName(getActiveFeedId(), activeFeedIsCat());
+
+               str = str.replace("%s", fn);
+
+               if (getInitParam("confirm_feed_catchup") == 1 && !confirm(str)) {
+                       return;
+               }
+
+               var catchup_query = "?op=rpc&subop=catchupFeed&feed_id=" +
+                       feed + "&is_cat=" + is_cat;
+
+               notify_progress("Loading, please wait...", true);
+
+               new Ajax.Request("backend.php", {
+                       parameters: catchup_query,
+                       onComplete: function(transport) {
+                                       handle_rpc_json(transport);
+                                       notify("");
+                               } });
+
+       } catch (e) {
+               exception_error("catchupFeed", e);
+       }
+}