Explicitly pass store to RuleSets.initialize.

cowlicks · cowlicks · commit 3a7993c09467 · 2017-10-16T13:54:13.000-07:00
diff --git a/chromium/background.js b/chromium/background.js
@@ -7,7 +7,7 @@ let all_rules = new rules.RuleSets();
 async function initialize() {
   await store.initialize();
   await initializeStoredGlobals();
-  await all_rules.initialize();
+  await all_rules.initialize(store);
 
   // Send a message to the embedded webextension bootstrap.js to get settings to import
   chrome.runtime.sendMessage("import-legacy-data", import_settings);
@@ -597,7 +597,7 @@ async function import_settings(settings) {
     });
 
     Object.assign(all_rules, new rules.RuleSets());
-    await all_rules.initialize();
+    await all_rules.initialize(store);
 
   }
 }
diff --git a/chromium/rules.js b/chromium/rules.js
@@ -206,7 +206,8 @@ function RuleSets() {
 
 RuleSets.prototype = {
 
-  initialize: async function() {
+  initialize: async function(store) {
+    this.store = store;
     this.ruleActiveStates = store.localStorage;
     this.addFromJson(util.loadExtensionFile('rules/default.rulesets', 'json'));
     this.loadStoredUserRules();
@@ -356,7 +357,7 @@ RuleSets.prototype = {
   * Retrieve stored user rules from localStorage
   **/
   getStoredUserRules: function() {
-    const oldUserRuleString = store.localStorage.getItem(this.USER_RULE_KEY);
+    const oldUserRuleString = this.store.localStorage.getItem(this.USER_RULE_KEY);
     let oldUserRules = [];
     if (oldUserRuleString) {
       oldUserRules = JSON.parse(oldUserRuleString);
@@ -390,7 +391,7 @@ RuleSets.prototype = {
       // client windows in different event loops.
       oldUserRules.push(params);
       // TODO: can we exceed the max size for storage?
-      store.localStorage.setItem(this.USER_RULE_KEY, JSON.stringify(oldUserRules));
+      this.store.localStorage.setItem(this.USER_RULE_KEY, JSON.stringify(oldUserRules));
     }
   },
 
@@ -406,13 +407,13 @@ RuleSets.prototype = {
         !(r.host == ruleset.name &&
           r.redirectTo == ruleset.rules[0].to)
       );
-      store.localStorage.setItem(this.USER_RULE_KEY, JSON.stringify(userRules));
+      this.store.localStorage.setItem(this.USER_RULE_KEY, JSON.stringify(userRules));
     }
   },
 
   addStoredCustomRulesets: function(){
     return new Promise(resolve => {
-      store.get({
+      this.store.get({
         legacy_custom_rulesets: [],
         debugging_rulesets: ""
       }, item => {

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ let all_rules = new rules.RuleSets();`
`7`	`7`	`async function initialize() {`
`8`	`8`	`await store.initialize();`
`9`	`9`	`await initializeStoredGlobals();`
`10`		`- await all_rules.initialize();`
	`10`	`+ await all_rules.initialize(store);`
`11`	`11`
`12`	`12`	`// Send a message to the embedded webextension bootstrap.js to get settings to import`
`13`	`13`	`chrome.runtime.sendMessage("import-legacy-data", import_settings);`
`@@ -597,7 +597,7 @@ async function import_settings(settings) {`
`597`	`597`	`});`
`598`	`598`
`599`	`599`	`Object.assign(all_rules, new rules.RuleSets());`
`600`		`- await all_rules.initialize();`
	`600`	`+ await all_rules.initialize(store);`
`601`	`601`
`602`	`602`	`}`
`603`	`603`	`}`