js: code cleanup

diff --git a/functions.js b/functions.js
index 1b5bfaf4b2898438e5aa87a2fa2d65baa06a3dbe..ed4f4712282197451848ca2d2d5bff14e64240db 100644 (file)
--- a/functions.js
+++ b/functions.js
@@ -419,21 +419,6 @@ function displayDlg(id, param, callback) {
        return false;
 }
 
-function infobox_submit_callback2(transport) {
-       closeInfoBox();
-
-       try {
-               // called from prefs, reload tab
-               if (typeof active_tab != 'undefined' && active_tab) {
-                       selectTab(active_tab, false);
-               }
-       } catch (e) { }
-
-       if (transport.responseText) {
-               notify_info(transport.responseText);
-       }
-}
-
 function infobox_callback2(transport) {
        try {
                var dialog = false;
@@ -680,24 +665,6 @@ function remove_splash() {
        }
 }
 
-/* function getSelectedFeedsFromBrowser() {
-
-       var list = $$("#browseFeedList li[id*=FBROW]");
-
-       var selected = new Array();
-
-       list.each(function(child) {     
-               var id = child.id.replace("FBROW-", "");
-
-               if (child.hasClassName('Selected')) {
-                       selected.push(id);
-               }       
-       });
-
-       return selected;
-} */
-
-
 function transport_error_check(transport) {
        try {
                if (transport.responseXML) {
@@ -862,7 +829,7 @@ function addLabel(select, callback) {
                                        if (callback) {
                                                callback(transport);
                                        } else if (inPreferences()) {
-                                               infobox_submit_callback2(transport);
+                                               updateLabelList();
                                        } else {
                                                updateFeedList();
                                        }
@@ -917,11 +884,7 @@ function quickAddFeed() {
                                                                        dialog.hide();
                                                                        notify_info(__("Subscribed to %s").replace("%s", feed_url));
                                        
-                                                                       if (inPreferences()) {
-                                                                               updateFeedList();
-                                                                       } else {
-                                                                               setTimeout('updateFeedList(false, false)', 50);
-                                                                       }
+                                                                       updateFeedList();
                                                                        break;
                                                                case 2:
                                                                        alert(__("Specified URL seems to be invalid."));

diff --git a/tt-rss.js b/tt-rss.js
index 6ba2f86ad7c6328dae6757d271433751a1840946..6569f8e51df193828ef4a6382b6295839ff05749 100644 (file)
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -660,7 +660,6 @@ function hotkey_handler(e) {
                                Element.hide("hotkey_help_overlay");
                        }
                        hotkey_prefix = false;
-                       closeInfoBox();
                } 
 
                if (keycode == 16) return; // ignore lone shift