Import r6948 from upstream hg supporting Firefox up to 24.*

[dactyl.git] / common / bootstrap.js

diff --git a/common/bootstrap.js b/common/bootstrap.js
index d0dd98a809265f8e95fc3ef420cdb286a89ab02b..de289ee03f849a39bc0af3e2575bfd388ade2a69 100755 (executable)
--- a/common/bootstrap.js
+++ b/common/bootstrap.js
@@ -37,9 +37,9 @@ function reportError(e) {
     Cc["@mozilla.org/consoleservice;1"].getService(Ci.nsIConsoleService)
                                        .logStringMessage(stack);
 }
-function debug() {
+function debug(...args) {
     if (DEBUG)
-        dump(name + ": " + Array.join(arguments, ", ") + "\n");
+        dump(name + ": " + args.join(", ") + "\n");
 }
 
 function httpGet(uri) {
@@ -103,7 +103,7 @@ let JSMLoader = {
             return resourceProto.resolveURI(uri);
 
         let chan = Services.io.newChannelFromURI(uri);
-        try { chan.cancel(Cr.NS_BINDING_ABORTED) } catch (e) {}
+        try { chan.cancel(Cr.NS_BINDING_ABORTED); } catch (e) {}
         return chan.name;
     },