code cleanups

[tt-rss.git] / feedlist.js

diff --git a/feedlist.js b/feedlist.js
index 355b4d88544b2f8e29e56bd61b5e71bec34841e7..cc36587a2eb288bbbdb3fdb99b74e8ea244950f8 100644 (file)
--- a/feedlist.js
+++ b/feedlist.js
@@ -1,46 +1,47 @@
-var xmlhttp = Ajax.getTransport();
-
-var cat_view_mode = false;
+//var xmlhttp = Ajax.getTransport();
 
 function viewCategory(cat) {
-       viewfeed(cat, 0, '', false, 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, skip, subop, doc, is_cat, subop_param) {
+function viewfeed(feed, subop, is_cat, subop_param) {
        try {
 
-               if (!doc) doc = parent.document;
-       
                enableHotkeys();
-       
-               var toolbar_query = parent.Form.serialize("main_toolbar_form");
-               var toolbar_form = parent.document.forms["main_toolbar_form"];
 
-               if (parent.document.forms["main_toolbar_form"].query) {
+               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 = "";
                }
 
-//             setCookie("ttrss_vf_limit", toolbar_form.limit[toolbar_form.limit.selectedIndex].value);
-//             setCookie("ttrss_vf_vmode", toolbar_form.view_mode[toolbar_form.view_mode.selectedIndex].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);
+                       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);
                }
 
-               if (getActiveFeedId() != feed) {
-                       cat_view_mode = is_cat;
-               }
+               debug("IS_CAT_STORED: " + activeFeedIsCat() + ", IS_CAT: " + is_cat);
 
                var fe = document.getElementById("FEEDR-" + getActiveFeedId());
 
@@ -50,58 +51,63 @@ function viewfeed(feed, skip, subop, doc, is_cat, subop_param) {
 
                setActiveFeedId(feed);
        
-               if (subop == "MarkAllRead") {
-
-                       var feedr = document.getElementById("FEEDR-" + feed);
-                       var feedctr = document.getElementById("FEEDCTR-" + feed);
+               if (is_cat != undefined) {
+                       active_feed_is_cat = is_cat;
+               }
 
-                       if (feedr && feedctr) {
-               
-                               feedctr.className = "invisible";
-       
-                               if (feedr.className.match("Unread")) {
-                                       feedr.className = feedr.className.replace("Unread", "");
-                               }
-                       }
+               if (subop == "MarkAllRead") {
 
                        var feedlist = document.getElementById('feedList');
                        
                        var next_unread_feed = getRelativeFeedId(feedlist,
                                        getActiveFeedId(), "next", true);
 
-                       var show_next_feed = parent.getInitParam("on_catchup_show_next_feed") == "1";
+                       var show_next_feed = getInitParam("on_catchup_show_next_feed") == "1";
 
-                       if (next_unread_feed && show_next_feed) {
+                       if (next_unread_feed && show_next_feed && !activeFeedIsCat()) {
                                query = query + "&nuf=" + param_escape(next_unread_feed);
                                setActiveFeedId(next_unread_feed);
                        }
                }
 
-               if (cat_view_mode) {
+               if (activeFeedIsCat()) {
                        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 (!activeFeedIsCat()) {
+                       var feedr = document.getElementById("FEEDR-" + getActiveFeedId());
+                       if (feedr && !feedr.className.match("Selected")) {      
+                               feedr.className = feedr.className + "Selected";
+                       } 
+               }
+               
+               disableContainerChildren("headlinesToolbar", false);
+               Form.enable("main_toolbar_form");
+
                debug(query);
 
-               headlines_frame.location.href = query;
-       
-//             cleanSelectedList("feedList");
-       
-               var feedr = document.getElementById("FEEDR-" + getActiveFeedId());
-               if (feedr && !feedr.className.match("Selected")) {      
-                       feedr.className = feedr.className + "Selected";
-               } 
-               
-               parent.disableContainerChildren("headlinesToolbar", false);
-               parent.Form.enable("main_toolbar_form");
+/*             var container = document.getElementById("headlines-frame");
+
+               container.innerHTML = "<div class=\"loadingPrompt\"><img src=\"images/indicator_white.gif\">&nbsp;" +
+                       "Loading, please wait...</div>"; */
+
+               notify("Loading, please wait...", true);
+
+               xmlhttp.abort();
+
+               if (xmlhttp_ready(xmlhttp)) {
+                       xmlhttp.open("GET", query, true);
+                       xmlhttp.onreadystatechange=headlines_callback;
+                       xmlhttp.send(null);
+               } else {
+                       debug("xmlhttp busy (@feeds)");
+               }  
 
        } catch (e) {
                exception_error("viewfeed", e);
@@ -141,24 +147,28 @@ function toggleCollapseCat(cat) {
        }
 }
 
-function init() {
+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();
                }
 
        } catch (e) {