this fixes #248

Author: gorhill

js/httpsb.js

@@ -781,12 +781,32 @@ HTTPSB.revertScopeRules = function(scopeKey) {
         return;
     }
     var pscope = this.permanentScopeFromScopeKey(scopeKey);
-    // If no permanent scope found, use factory settings
-    if ( !pscope ) {
-        pscope = this.factoryScope;
+    if ( pscope ) {
+        // TODO: if global scope, intersect using ruleset
+        tscope.assign(pscope);
+        return;
+    }
+
+    // https://github.com/gorhill/httpswitchboard/issues/248
+    // If no permanent scope found, use generic rules in global scope
+    tscope.removeAllRules();
+    pscope = this.permanentScopeFromScopeKey('*');
+    tscope.mtxFiltering = pscope.mtxFiltering;
+    tscope.abpFiltering = pscope.abpFiltering;
+    var listKeys = ['white', 'black'];
+    var listKey, list;
+    while ( listKey = listKeys.pop() ) {
+        list = pscope[listKey];
+        for ( var ruleKey in list.list ) {
+            if ( list.list.hasOwnProperty(ruleKey) === false ) {
+                continue;
+            }
+            // Mind only rules which apply on any domain
+            if ( list.hostnameFromRuleKey(ruleKey) === '*' ) {
+                tscope[listKey].addOne(ruleKey);
+            }
+        }
     }
-    // TODO: if global scope, intersect using ruleset
-    tscope.assign(pscope);
 };
 
 /******************************************************************************/

js/lists.js

@@ -172,6 +172,17 @@ PermissionList.prototype.diffCount = function(other) {
     return count;
 };
 
+/******************************************************************************/
+
+PermissionList.prototype.typeFromRuleKey = function(ruleKey) {
+    var pos = ruleKey.indexOf('|');
+    return pos < 0 ? '' : ruleKey.slice(0, pos);
+};
+PermissionList.prototype.hostnameFromRuleKey = function(ruleKey) {
+    var pos = ruleKey.indexOf('|');
+    return pos < 0 ? '' : ruleKey.slice(pos + 1);
+};
+
 /******************************************************************************/
 /******************************************************************************/
 
@@ -218,6 +229,14 @@ PermissionScope.prototype.add = function(other) {
 
 /******************************************************************************/
 
+PermissionScope.prototype.removeAllRules = function() {
+    this.white.removeAll();
+    this.black.removeAll();
+    this.gray.removeAll();
+};
+
+/******************************************************************************/
+
 PermissionScope.prototype.diffCount = function(other) {
     if ( !other ) {
         return this.white.count + this.black.count + this.gray.count + 2;