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

[tt-rss.git] / tt-rss.js

diff --git a/tt-rss.js b/tt-rss.js
index 6660a5d90c0bc82f6231acfab629fdda6fd3f885..b46c859acccfd3b1f30ab0a84000d1107bc2295b 100644 (file)
--- 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;
        }