regression: fixed persistence

Author: gorhill

js/httpsb.js

@@ -131,9 +131,6 @@ HTTPSB.createPermanentGlobalScope = function(url) {
     if ( this.removePermanentScopeFromScopeKey(scopeKey) ) {
         changed = true;
     }
-    if ( changed ) {
-        this.savePermissions();
-    }
     return changed;
 };
 
@@ -167,16 +164,11 @@ HTTPSB.createPermanentDomainScope = function(url) {
         this.permanentScopes.scopes[scopeKey] = scope;
         changed = true;
     }
-
     // Remove potentially existing site scope: it would occlude domain scope.
     scopeKey = this.siteScopeKeyFromURL(url);
     if ( this.removePermanentScopeFromScopeKey(scopeKey) ) {
         changed = true;
     }
-
-    if ( changed ) {
-        this.savePermissions();
-    }
     return changed;
 };
 
@@ -206,7 +198,6 @@ HTTPSB.createPermanentSiteScope = function(url) {
     scope = new PermissionScope();
     scope.whitelist('main_frame', '*');
     this.permanentScopes.scopes[scopeKey] = scope;
-    this.savePermissions();
     return true;
 };
 

js/popup.js

@@ -1336,15 +1336,19 @@ function updatePersistButton() {
 
 function persistScope() {
     var httpsb = getHTTPSB();
-    var rulset = getTemporaryRuleset();
-    if ( httpsb.isGlobalScopeKey(rulset.tScopeKey) ) {
-        httpsb.createPermanentGlobalScope(HTTPSBPopup.pageURL);
-    } else if ( httpsb.isDomainScopeKey(rulset.tScopeKey) ) {
-        httpsb.createPermanentDomainScope(HTTPSBPopup.pageURL);
-    } else if ( httpsb.isSiteScopeKey(rulset.tScopeKey) ) {
-        httpsb.createPermanentSiteScope(HTTPSBPopup.pageURL);
-    }
-    httpsb.applyRulesetPermanently(rulset.tScopeKey, rulset);
+    var ruleset = getTemporaryRuleset();
+    var changed = false;
+    if ( httpsb.isGlobalScopeKey(ruleset.tScopeKey) ) {
+        changed = httpsb.createPermanentGlobalScope(HTTPSBPopup.pageURL);
+    } else if ( httpsb.isDomainScopeKey(ruleset.tScopeKey) ) {
+        changed = httpsb.createPermanentDomainScope(HTTPSBPopup.pageURL);
+    } else if ( httpsb.isSiteScopeKey(ruleset.tScopeKey) ) {
+        changed = httpsb.createPermanentSiteScope(HTTPSBPopup.pageURL);
+    }
+    changed = httpsb.applyRulesetPermanently(ruleset.tScopeKey, ruleset) || changed;
+    if ( changed ) {
+        httpsb.savePermissions();
+    }
     updateMatrixStats();
     updateMatrixColors();
     updateMatrixBehavior();
@@ -1358,16 +1362,16 @@ function persistScope() {
 
 function revertScope() {
     var httpsb = getHTTPSB();
-    var rulset = getTemporaryRuleset();
-    httpsb.revertScopeRules(rulset.tScopeKey);
-    if ( httpsb.isGlobalScopeKey(rulset.pScopeKey) ) {
+    var ruleset = getTemporaryRuleset();
+    httpsb.revertScopeRules(ruleset.tScopeKey);
+    if ( httpsb.isGlobalScopeKey(ruleset.pScopeKey) ) {
         httpsb.createTemporaryGlobalScope(HTTPSBPopup.pageURL);
-    } else if ( httpsb.isDomainScopeKey(rulset.pScopeKey) ) {
+    } else if ( httpsb.isDomainScopeKey(ruleset.pScopeKey) ) {
         httpsb.createTemporaryDomainScope(HTTPSBPopup.pageURL);
-    } else if ( httpsb.isSiteScopeKey(rulset.pScopeKey) ) {
+    } else if ( httpsb.isSiteScopeKey(ruleset.pScopeKey) ) {
         httpsb.createTemporarySiteScope(HTTPSBPopup.pageURL);
     }
-    httpsb.revertScopeRules(rulset.pScopeKey);
+    httpsb.revertScopeRules(ruleset.pScopeKey);
     updateMatrixStats();
     updateMatrixColors();
     updateMatrixBehavior();

js/storage.js

@@ -85,6 +85,7 @@ HTTPSB.loadScopedRules = function() {
             httpsb.createTemporaryScopeFromScopeKey(httpsb.behindTheSceneScopeKey);
             httpsb.whitelistTemporarily(httpsb.behindTheSceneScopeKey, '*', '*');
             httpsb.toggleTemporaryMtxFiltering(httpsb.behindTheSceneScopeKey, false);
+            httpsb.toggleTemporaryABPFiltering(httpsb.behindTheSceneScopeKey, false);
         }
 
         // rhill 2013-09-23: ok, there is no point in blacklisting