From 36146ae5036f9a2dae13335b7b4593e7c5fca127 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Fri, 26 Nov 2010 19:22:08 +0300
Subject: [PATCH] js: code cleanup

---
 functions.js | 41 ++---------------------------------------
 tt-rss.js    |  1 -
 2 files changed, 2 insertions(+), 40 deletions(-)

diff --git a/functions.js b/functions.js
index 1b5bfaf4..ed4f4712 100644
--- 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 6ba2f86a..6569f8e5 100644
--- 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
-- 
2.39.5