Pass URI instead of browser in ApplicableList constructor

diracdeltas · diracdeltas · commit 8e92b51a73e4 · 2014-09-06T20:51:30.000-07:00
diff --git a/src/chrome/content/code/ApplicableList.js b/src/chrome/content/code/ApplicableList.js
@@ -4,17 +4,16 @@
 
 serial_number = 0;
 
-function ApplicableList(logger, browser) {
+function ApplicableList(logger, uri) {
   this.log = logger;
-  this.uri = browser.currentURI.clone();
+  this.uri = uri.clone();
   if (!this.uri) {
     this.log(WARN,"NULL CLONING URI " + doc);
-    if (browser) 
-      this.log(WARN,"NULL CLONING URI " + browser.currentURI);
-    if (browser.currentURI) 
-      this.log(WARN,"NULL CLONING URI " + browser.currentURI.spec);
+    if (uri) {
+      this.log(WARN,"NULL CLONING URI " + uri.spec);
+    }
   }
-  this.home = browser.currentURI.spec; // what doc we're housekeeping for
+  this.home = uri.spec; // what doc we're housekeeping for
   this.active = {};
   this.breaking = {}; // rulesets with redirection loops
   this.inactive = {};
diff --git a/src/chrome/content/toolbar_button.js b/src/chrome/content/toolbar_button.js
@@ -286,7 +286,7 @@ function show_applicable_list(menupopup) {
     // This case occurs for error pages and similar.  We need a dummy alist
     // because populate_menu lives in there.  Would be good to refactor this
     // away.
-    alist = new HTTPSEverywhere.ApplicableList(HTTPSEverywhere.log, browser);
+    alist = new HTTPSEverywhere.ApplicableList(HTTPSEverywhere.log, browser.currentURI);
     weird = true;
   }
   alist.populate_menu(document, menupopup, weird);
diff --git a/src/components/https-everywhere.js b/src/components/https-everywhere.js
@@ -341,7 +341,7 @@ HTTPSEverywhere.prototype = {
       this.log(WARN, "Get alist without browser");
       return null;
     }
-    var alist = new ApplicableList(this.log,browser);
+    var alist = new ApplicableList(this.log, browser.currentURI);
     this.setExpando(browser,"applicable_rules",alist);
     return alist;
   },
@@ -355,7 +355,7 @@ HTTPSEverywhere.prototype = {
     if (alist) {
       return alist;
     } else {
-      alist = new ApplicableList(this.log,browser);
+      alist = new ApplicableList(this.log, browser.currentURI);
       this.setExpando(browser,"applicable_rules",alist);
     }
     return alist;
@@ -608,7 +608,7 @@ HTTPSEverywhere.prototype = {
       new_alist = old_alist;
       this.setExpando(browser,"applicable_rules",new_alist);
     } else if (!new_alist) {
-      new_alist = new ApplicableList(this.log, browser);
+      new_alist = new ApplicableList(this.log, browser.currentURI);
       this.setExpando(browser,"applicable_rules",new_alist);
     }
     return new_alist;

Original file line number	Diff line number	Diff line change
`@@ -286,7 +286,7 @@ function show_applicable_list(menupopup) {`
`286`	`286`	`// This case occurs for error pages and similar. We need a dummy alist`
`287`	`287`	`// because populate_menu lives in there. Would be good to refactor this`
`288`	`288`	`// away.`
`289`		`- alist = new HTTPSEverywhere.ApplicableList(HTTPSEverywhere.log, browser);`
	`289`	`+ alist = new HTTPSEverywhere.ApplicableList(HTTPSEverywhere.log, browser.currentURI);`
`290`	`290`	`weird = true;`
`291`	`291`	`}`
`292`	`292`	`alist.populate_menu(document, menupopup, weird);`