disable pref toolbars when nothing is selected (take two)

1 files changed, 29 insertions, 19 deletions

diff --git a/prefs.js b/prefs.js
index fc3d6eb05..b10e257cb 100644
--- a/prefs.js
+++ b/prefs.js
@@ -462,6 +462,29 @@ function getSelectedFeedCats() {
 	return getSelectedTableRowIds("prefFeedCatList", "FCATR");
 }
 
+function getSelectedFeedsFromBrowser() {
+
+	var list = document.getElementById("browseFeedList");
+	if (!list) list = document.getElementById("browseBigFeedList");
+
+	var selected = new Array();
+	
+	for (i = 0; i < list.childNodes.length; i++) {
+		var child = list.childNodes[i];
+		if (child.id && child.id.match("FBROW-")) {
+			var id = child.id.replace("FBROW-", "");
+			
+			var cb = document.getElementById("FBCHK-" + id);
+
+			if (cb.checked) {
+				selected.push(id);
+			}
+		}
+	}
+
+	return selected;
+}
+
 
 /*function readSelectedFeeds(read) {
 
@@ -585,7 +608,7 @@ function removeSelectedFeeds() {
 
 	if (sel_rows.length > 0) {
 
-		var ok = confirm("Remove selected feeds?");
+		var ok = confirm("Unsubscribe from selected feeds?");
 
 		if (ok) {
 
@@ -1376,24 +1399,8 @@ function browseFeeds(limit) {
 
 function feedBrowserSubscribe() {
 	try {
-		var list = document.getElementById("browseFeedList");
-
-		if (!list) list = document.getElementById("browseBigFeedList");
-
-		var selected = new Array();
 
-		for (i = 0; i < list.childNodes.length; i++) {
-			var child = list.childNodes[i];
-			if (child.id && child.id.match("FBROW-")) {
-				var id = child.id.replace("FBROW-", "");
-				
-				var cb = document.getElementById("FBCHK-" + id);
-
-				if (cb.checked) {
-					selected.push(id);
-				}
-			}
-		}
+		var selected = getSelectedFeedsFromBrowser();
 
 		if (selected.length > 0) {
 			closeInfoBox();
@@ -1548,4 +1555,7 @@ function toggleSelectPrefRow(sender, kind) {
 	} 
 }
 
-
+function toggleSelectFBListRow(sender) {
+	toggleSelectListRow(sender);
+	disableContainerChildren("fbrOpToolbar", getSelectedFeedsFromBrowser() == 0);
+}