add persistent storage for toolbar view options, bump schema

[tt-rss.git] / feedlist.js

diff --git a/feedlist.js b/feedlist.js
index df1e17fb6790456e75cce67c510b23a72175edb0..9d6be547c7e506729cb95f606ed3186967aeb929 100644 (file)
--- a/feedlist.js
+++ b/feedlist.js
@@ -1,42 +1,69 @@
-var xmlhttp = Ajax.getTransport();
+//var xmlhttp = Ajax.getTransport();
 
 function viewCategory(cat) {
-       getMainContext().active_feed_is_cat = true;
+       active_feed_is_cat = true;
        viewfeed(cat, '', true);
 }
 
 function feedlist_callback() {
        if (xmlhttp.readyState == 4) {
+               debug("feedlist_callback");
                var f = document.getElementById("feeds-frame");
                f.innerHTML = xmlhttp.responseText;
+               feedlist_init();
        }
 }
 
-function viewfeed(feed, subop, is_cat, subop_param) {
+var page_offset = 0;
+
+function viewFeedGoPage(i) {
        try {
+               if (!getActiveFeedId()) return;
+
+               if (i != 0) {
+                       page_offset = page_offset + i;
+               } else {
+                       page_offset = 0;
+               }
+
+               if (page_offset < 0) page_offset = 0;
+               viewfeed(getActiveFeedId(), undefined, undefined, undefined,
+                       undefined, page_offset);
+       } catch (e) {
+               exception_error(e, "viewFeedGoPage");
+       }
+}
+
+function viewfeed(feed, subop, is_cat, subop_param, skip_history, offset) {
+       try {
+
+               //if (!offset) page_offset = 0;
+
+               if (offset != undefined) {
+                       page_offset = offset;
+               }
 
                enableHotkeys();
 
-               var toolbar_query = parent.Form.serialize("main_toolbar_form");
+               if (!skip_history) {
+                       history_push('FEED:' + feed + ':' + subop + ':' + is_cat +
+                               ':' + subop_param);
+               }
+
+               var toolbar_query = Form.serialize("main_toolbar_form");
                var toolbar_form = document.forms["main_toolbar_form"];
 
                if (document.forms["main_toolbar_form"].query) {
                        toolbar_form.query.value = "";
                }
 
-/*             storeInitParam("toolbar_limit", 
-                       toolbar_form.limit[toolbar_form.limit.selectedIndex].value);
-
-               storeInitParam("toolbar_view_mode", 
-                       toolbar_form.view_mode[toolbar_form.view_mode.selectedIndex].value);  */
-
                var query = "backend.php?op=viewfeed&feed=" + feed + "&" +
                        toolbar_query + "&subop=" + param_escape(subop);
 
-               if (parent.document.getElementById("search_form")) {
-                       var search_query = parent.Form.serialize("search_form");
+               if (document.getElementById("search_form")) {
+                       var search_query = Form.serialize("search_form");
                        query = query + "&" + search_query;
-                       parent.closeInfoBox(true);
+                       closeInfoBox(true);
                }
 
                debug("IS_CAT_STORED: " + activeFeedIsCat() + ", IS_CAT: " + is_cat);
@@ -50,7 +77,7 @@ function viewfeed(feed, subop, is_cat, subop_param) {
                setActiveFeedId(feed);
        
                if (is_cat != undefined) {
-                       getMainContext().active_feed_is_cat = is_cat;
+                       active_feed_is_cat = is_cat;
                }
 
                if (subop == "MarkAllRead") {
@@ -60,7 +87,12 @@ function viewfeed(feed, subop, is_cat, subop_param) {
                        var next_unread_feed = getRelativeFeedId(feedlist,
                                        getActiveFeedId(), "next", true);
 
-                       var show_next_feed = parent.getInitParam("on_catchup_show_next_feed") == "1";
+                       if (!next_unread_feed) {
+                               next_unread_feed = getRelativeFeedId(feedlist,
+                                       -1, "next", true);
+                       }
+
+                       var show_next_feed = getInitParam("on_catchup_show_next_feed") == "1";
 
                        if (next_unread_feed && show_next_feed && !activeFeedIsCat()) {
                                query = query + "&nuf=" + param_escape(next_unread_feed);
@@ -72,14 +104,14 @@ function viewfeed(feed, subop, is_cat, subop_param) {
                        query = query + "&cat=1";
                }
 
-               var headlines_frame = parent.frames["headlines-frame"];
-
-               if (navigator.userAgent.match("Opera")) {
-                       var date = new Date();
-                       var timestamp = Math.round(date.getTime() / 1000);
-                       query = query + "&ts=" + timestamp
+               if (page_offset != 0) {
+                       query = query + "&skip=" + page_offset;
                }
 
+               var date = new Date();
+               var timestamp = Math.round(date.getTime() / 1000);
+               query = query + "&ts=" + timestamp
+
                if (!activeFeedIsCat()) {
                        var feedr = document.getElementById("FEEDR-" + getActiveFeedId());
                        if (feedr && !feedr.className.match("Selected")) {      
@@ -92,6 +124,15 @@ function viewfeed(feed, subop, is_cat, subop_param) {
 
                debug(query);
 
+/*             var container = document.getElementById("headlines-frame");
+
+               container.innerHTML = "<div class=\"loadingPrompt\"><img src=\"images/indicator_white.gif\">&nbsp;" +
+                       "Loading, please wait...</div>"; */
+
+               notify_progress("Loading, please wait...", true);
+
+//             xmlhttp.abort();
+
                if (xmlhttp_ready(xmlhttp)) {
                        xmlhttp.open("GET", query, true);
                        xmlhttp.onreadystatechange=headlines_callback;
@@ -100,7 +141,6 @@ function viewfeed(feed, subop, is_cat, subop_param) {
                        debug("xmlhttp busy (@feeds)");
                }  
 
-
        } catch (e) {
                exception_error("viewfeed", e);
        }               
@@ -141,24 +181,33 @@ function toggleCollapseCat(cat) {
 
 function feedlist_init() {
        try {
-               if (arguments.callee.done) return;
-               arguments.callee.done = true;           
+//             if (arguments.callee.done) return;
+//             arguments.callee.done = true;           
                
-               parent.debug("in feedlist init");
+               debug("in feedlist init");
                
                hideOrShowFeeds(document, getInitParam("hide_read_feeds") == 1);
                document.onkeydown = hotkey_handler;
-               parent.setTimeout("timeout()", 0);
+               setTimeout("timeout()", 0);
 
-               parent.debug("about to remove splash, OMG!");
+               debug("about to remove splash, OMG!");
 
-               var o = parent.document.getElementById("overlay");
+               var o = document.getElementById("overlay");
 
                if (o) {
                        o.style.display = "none";
-                       parent.debug("removed splash!");
+                       debug("removed splash!");
                }
 
+               if (typeof correctPNG != 'undefined') {
+                       correctPNG();
+               }
+
+               if (getActiveFeedId()) {
+                       debug("some feed is open on feedlist refresh, reloading");
+                       setTimeout("viewCurrentFeed()", 100);
+               } 
+
        } catch (e) {
                exception_error("feedlist/init", e);
        }