code cleanups

diff --git a/feedlist.js b/feedlist.js
index f0265178c7a724e162cae2103aab748419160223..17ca3f9ee75e7b0505481b250754818ee9a4a962 100644 (file)
--- a/feedlist.js
+++ b/feedlist.js
@@ -19,7 +19,7 @@ function viewfeed(feed, subop, is_cat, subop_param) {
 
                enableHotkeys();
 
-               var toolbar_query = parent.Form.serialize("main_toolbar_form");
+               var toolbar_query = Form.serialize("main_toolbar_form");
                var toolbar_form = document.forms["main_toolbar_form"];
 
                if (document.forms["main_toolbar_form"].query) {
@@ -35,10 +35,10 @@ function viewfeed(feed, subop, is_cat, subop_param) {
                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);
@@ -62,7 +62,7 @@ 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";
+                       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);
@@ -74,8 +74,6 @@ 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);

diff --git a/functions.js b/functions.js
index 1949086f6c5c28f2b711cb16cda9a557d14c64f3..72638dcca3e4fcb64df3aa86ae7238c309522fdd 100644 (file)
--- a/functions.js
+++ b/functions.js
@@ -145,7 +145,7 @@ function notify_real(msg, doc, no_hide, is_err) {
 }
 
 function p_notify(msg, no_hide, is_err) {
-       notify_real(msg, parent.document, no_hide, is_err);
+       notify_real(msg, document, no_hide, is_err);
 }
 
 function notify(msg, no_hide, is_err) {
@@ -246,7 +246,7 @@ function cleanSelectedList(element) {
                for (i = 0; i < content.childNodes.length; i++) {
                        var child = content.childNodes[i];
                        if (child.id == "feedCatHolder") {
-                               parent.debug(child.id);
+                               debug(child.id);
                                var fcat = child.lastChild;
                                for (j = 0; j < fcat.childNodes.length; j++) {
                                        var feed = fcat.childNodes[j];
@@ -539,10 +539,7 @@ function parse_counters(reply, scheduled_call) {
                        if (feedctr && feedu && feedr) {
 
                                if (feedu.innerHTML != ctr && id == getActiveFeedId() && scheduled_call) {
-//                                     var hf = title_obj.parent.frames["headlines-frame"];
-//                                     hf.location.reload(true);
                                        viewCurrentFeed();
-
                                }
                
                                feedu.innerHTML = ctr;

diff --git a/viewfeed.js b/viewfeed.js
index 5159a57f6a3ee191df0f62500d7bf1cfafdd3672..1fab250271dd4a35164c5a29054ba5b0b8a3afe9 100644 (file)
--- a/viewfeed.js
+++ b/viewfeed.js
@@ -389,7 +389,7 @@ function labelFromSearch(search, search_mode, match_on, feed_id, is_cat) {
 }
 
 
-
+/*
 function headlines_init() {
        if (arguments.callee.done) return;
        arguments.callee.done = true;           
@@ -413,3 +413,4 @@ function headlines_init() {
        }
 
 }
+*/