Improvements in response to feedback from AMO-editors.

jsha · jsha · commit d4f67994aa40 · 2015-01-16T19:50:40.000-08:00
diff --git a/src/chrome/content/code/ApplicableList.js b/src/chrome/content/code/ApplicableList.js
@@ -212,13 +212,9 @@ ApplicableList.prototype = {
 
   add_command: function(rule) {
       var command = this.document.createElement("command");
-      if (typeof rule.id !== 'number') {
-        this.log(WARN, "Rule has invalid id " + rule.id);
-        return;
-      }
       command.setAttribute('id', rule.id+'-command');
       command.setAttribute('label', rule.name);
-      command.setAttribute('oncommand', 'toggle_rule("'+rule.id+'")');
+      command.setAttribute('oncommand', 'toggle_rule("'+JSON.stringify(rule.id)+'")');
       this.commandset.appendChild(command);
   },
 
diff --git a/src/chrome/content/code/ChannelReplacement.js b/src/chrome/content/code/ChannelReplacement.js
@@ -13,7 +13,7 @@ CtxCapturingListener.prototype = {
   },
   onDataAvailable: function(request, ctx, inputStream, offset, count) {},
   onStopRequest: function(request, ctx, statusCode) {},
-  QueryInterface: xpcom_generateQI([Ci.nsIStreamListener])
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsIStreamListener])
 };
 
 function ChannelReplacement(chan, newURI, newMethod) {
@@ -211,7 +211,7 @@ ChannelReplacement.prototype = {
   
   _redirectCallback: ("nsIAsyncVerifyRedirectCallback" in Ci)
     ? {
-        QueryInterface: xpcom_generateQI([Ci.nsIAsyncVerifyRedirectCallback]),
+        QueryInterface: XPCOMUtils.generateQI([Ci.nsIAsyncVerifyRedirectCallback]),
         onRedirectVerifyCallback: function(result) {}
       }
     : null
@@ -332,7 +332,7 @@ function LoadGroupWrapper(channel, callback) {
   channel.loadGroup = this;
 }
 LoadGroupWrapper.prototype = {
-  QueryInterface: xpcom_generateQI([Ci.nsILoadGroup]),
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsILoadGroup]),
   
   get activeCount() {
     return this._inner ? this._inner.activeCount : 0;
@@ -380,7 +380,7 @@ LoadGroupWrapper.prototype = {
     if (this._channel.loadGroup) this._channel.loadGroup = this._inner;
   },
   _emptyEnum: {
-    QueryInterface: xpcom_generateQI([Ci.nsISimpleEnumerator]),
+    QueryInterface: XPCOMUtils.generateQI([Ci.nsISimpleEnumerator]),
     getNext: function() { return null; },
     hasMoreElements: function() { return false; }
   }
diff --git a/src/chrome/content/code/Cookie.js b/src/chrome/content/code/Cookie.js
@@ -143,6 +143,6 @@ Cookie.prototype = {
   get isDomain() { return this.domain && this.domain[0] == '.'; },
   policy: 0,
   status: 0,
-  QueryInterface: xpcom_generateQI([Ci.nsICookie, Ci.nsICookie2])
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsICookie, Ci.nsICookie2])
   
 };
diff --git a/src/chrome/content/code/IOUtil.js b/src/chrome/content/code/IOUtil.js
@@ -57,7 +57,7 @@ function nsISupportsWrapper(wrapped) {
   this.wrappedJSObject = wrapped;
 }
 nsISupportsWrapper.prototype = {
-  QueryInterface: xpcom_generateQI([])
+  QueryInterface: XPCOMUtils.generateQI([])
 };
 
 const IOUtil = {
diff --git a/src/components/https-everywhere.js b/src/components/https-everywhere.js
@@ -125,26 +125,13 @@ var ABE = {
   }
 };
 
-function xpcom_generateQI(iids) {
-  var checks = [];
-  for each (var iid in iids) {
-    checks.push("CI." + iid.name + ".equals(iid)");
-  }
-  var src = checks.length
-    ? "if (" + checks.join(" || ") + ") return this;\n"
-    : "";
-  return new Function("iid", src + "throw Components.results.NS_ERROR_NO_INTERFACE;");
-}
-
 function xpcom_checkInterfaces(iid,iids,ex) {
   for (var j = iids.length; j-- >0;) {
     if (iid.equals(iids[j])) return true;
   }
   throw ex;
 }
 
-INCLUDE('ChannelReplacement', 'IOUtil', 'HTTPSRules', 'HTTPS', 'Thread', 'ApplicableList');
-
 Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
 
 // This is black magic for storing Expando data w/ an nsIDOMWindow 

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ function nsISupportsWrapper(wrapped) {`
`57`	`57`	`this.wrappedJSObject = wrapped;`
`58`	`58`	`}`
`59`	`59`	`nsISupportsWrapper.prototype = {`
`60`		`- QueryInterface: xpcom_generateQI([])`
	`60`	`+ QueryInterface: XPCOMUtils.generateQI([])`
`61`	`61`	`};`
`62`	`62`
`63`	`63`	`const IOUtil = {`