[Pkg-mozext-commits] [requestpolicy] 146/257: [ref] common.js: move `addAllowRules()` to `PolicyManager`

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository requestpolicy.

commit 96a9b69be5a2a5272e997d8ad03f646156be8b0d
Author: Martin Kimmerle <dev at 256k.de>
Date:   Tue Nov 17 18:21:42 2015 +0100

    [ref] common.js: move `addAllowRules()` to `PolicyManager`
---
 src/content/lib/policy-manager.alias-functions.js | 3 +++
 src/content/lib/policy-manager.jsm                | 9 +++++++++
 src/content/settings/common.js                    | 8 --------
 src/content/settings/oldrules.js                  | 2 +-
 src/content/settings/setup.js                     | 2 +-
 5 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/content/lib/policy-manager.alias-functions.js b/src/content/lib/policy-manager.alias-functions.js
index 4b87d66..9854e4c 100644
--- a/src/content/lib/policy-manager.alias-functions.js
+++ b/src/content/lib/policy-manager.alias-functions.js
@@ -33,6 +33,9 @@ PolicyManager = (function(self) {
                                                          C.RULE_ACTION_DENY);
   self.removeDenyRule = self.removeRule.bind(this, C.RULE_ACTION_DENY);
 
+  self.addAllowRules = self.addRules.bind(this, C.RULE_ACTION_ALLOW);
+  self.addDenyRules = self.addRules.bind(this, C.RULE_ACTION_DENY);
+
 
   function getRuleData(aOrigin, aDest) {
     let ruleData = {};
diff --git a/src/content/lib/policy-manager.jsm b/src/content/lib/policy-manager.jsm
index 775ee51..9ebdce5 100644
--- a/src/content/lib/policy-manager.jsm
+++ b/src/content/lib/policy-manager.jsm
@@ -236,6 +236,15 @@ var PolicyManager = (function(self) {
     notifyRulesChanged();
   };
 
+  self.addRules = function (aRuleAction, aRuleDataList, aNoStore=false) {
+    for (let ruleData of aRuleDataList) {
+      PolicyManager.addRule(aRuleAction, ruleData, true);
+    }
+    if (false === aNoStore) {
+      PolicyManager.storeRules();
+    }
+  };
+
   self.storeRules = function() {
     RulesetStorage.saveRawRulesetToFile(
         userRulesets["user"].rawRuleset, "user.json");
diff --git a/src/content/settings/common.js b/src/content/settings/common.js
index 1590478..dabf047 100644
--- a/src/content/settings/common.js
+++ b/src/content/settings/common.js
@@ -240,14 +240,6 @@ common.prefStringToObj = function (prefString) {
   return prefObj;
 };
 
-common.addAllowRules = function (rules) {
-  for (var i in rules) {
-    var ruleData = rules[i];
-    PolicyManager.addAllowRule(ruleData, true);
-  }
-  PolicyManager.storeRules();
-};
-
 common.localize = function(stringNames) {
   stringNames.forEach(function(name) {
     $('[data-string="' + name + '"]').each(function () {
diff --git a/src/content/settings/oldrules.js b/src/content/settings/oldrules.js
index 4dfdc77..a4e275f 100644
--- a/src/content/settings/oldrules.js
+++ b/src/content/settings/oldrules.js
@@ -72,7 +72,7 @@ function importOldRules() {
   if (!rules || rules.length == 0) {
     throw 'rules is undefined or empty';
   }
-  common.addAllowRules(rules);
+  PolicyManager.addAllowRules(rules);
   $("#doimport").hide();
   $("#policy").hide();
   $("#importoptions").hide();
diff --git a/src/content/settings/setup.js b/src/content/settings/setup.js
index 7ea40f2..0542822 100644
--- a/src/content/settings/setup.js
+++ b/src/content/settings/setup.js
@@ -135,7 +135,7 @@ function onload() {
       Logger.dump('Performing rule import.');
       var addHostWildcard = identLevel == 1;
       var rules = common.getOldRulesAsNewRules(addHostWildcard);
-      common.addAllowRules(rules);
+      PolicyManager.addAllowRules(rules);
     }
 
     // Skip the welcome screen.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/requestpolicy.git