Always show the menu, rather than a bizarre error popup.

pde · pde · commit 7b03a5d08847 · 2011-07-04T23:27:41.000-07:00
diff --git a/src/chrome/content/toolbar_button.js b/src/chrome/content/toolbar_button.js
@@ -43,17 +43,13 @@ function show_applicable_list() {
   var HTTPSEverywhere = CC["@eff.org/https-everywhere;1"].getService(Components.interfaces.nsISupports).wrappedJSObject;
   var alist = HTTPSEverywhere.getExpando(domWin,"applicable_rules", null);
   
-  if (alist) {
-    //alist.log(WARN,"Success wherein domWin is " + domWin);
-    //alist.show_applicable();
-    alist.populate_menu(document);
-  } else {
-    HTTPSEverywhere.log(WARN,"Failure wherein domWin is " + domWin);
-    var str = "Missing applicable rules for " + domWin.document.baseURIObject.spec;
-    str += "\ndomWin is " + domWin;
-    alert(str);
-    return null;
+  if (!alist) {
+    // 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 ApplicableList(HTTPSEverywhere.log, document, domWin);
   }
+  alist.populate_menu(document);
 }
 
 function toggle_rule(rule_id) {
diff --git a/src/components/https-everywhere.js b/src/components/https-everywhere.js
@@ -318,7 +318,7 @@ HTTPSEverywhere.prototype = {
       return null;
     }
     if (!nc) {
-      this.log(WARN, "no window for " + channel.URI.spec);
+      this.log(DBUG, "no window for " + channel.URI.spec);
       return null;
     } 
     try {

Original file line number	Diff line number	Diff line change
`@@ -318,7 +318,7 @@ HTTPSEverywhere.prototype = {`
`318`	`318`	`return null;`
`319`	`319`	`}`
`320`	`320`	`if (!nc) {`
`321`		`- this.log(WARN, "no window for " + channel.URI.spec);`
	`321`	`+ this.log(DBUG, "no window for " + channel.URI.spec);`
`322`	`322`	`return null;`
`323`	`323`	`}`
`324`	`324`	`try {`