help uses popup window, recolor infoBox, use subscribe dialog in prefs

1 files changed, 8 insertions, 3 deletions

diff --git a/tt-rss.js b/tt-rss.js
index 6660a5d90..b46c859ac 100644
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -476,8 +476,13 @@ function quickMenuGo(opid) {
 	
 		if (opid == "qmcRemoveFeed") {
 			var actid = getActiveFeedId();
-	
-			if (!actid || activeFeedIsCat()) {
+
+			if (activeFeedIsCat()) {
+				alert("You can't unsubscribe from the category.");
+				return;
+			}	
+
+			if (!actid) {
 				alert("Please select some feed first.");
 				return;
 			}
@@ -640,7 +645,7 @@ function editFeedDlg(feed) {
 		return;
 	}
 
-	if (feed <= 0 || active_feed_is_cat || tagsAreDisplayed()) {
+	if (feed <= 0 || activeFeedIsCat() || tagsAreDisplayed()) {
 		alert("You can't edit this kind of feed.");
 		return;
 	}