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

[dactyl.git] / common / components / commandline-handler.js

diff --git a/common/components/commandline-handler.js b/common/components/commandline-handler.js
index 738e27516d084a8a2f711c7ac28c1a59fe90a0f1..481cbcde083f3cb31895827ea49a9fa83e1ffd6f 100644 (file)
--- a/common/components/commandline-handler.js
+++ b/common/components/commandline-handler.js
@@ -17,11 +17,8 @@ Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
 
 function init() {
     Cu.import("resource://dactyl/bootstrap.jsm");
-    if (!JSMLoader.initialized)
-        JSMLoader.init();
-    JSMLoader.load("base.jsm", global);
-    require(global, "config");
-    require(global, "util");
+    require("config", global);
+    require("util", global);
 }
 
 function CommandLineHandler() {
@@ -94,4 +91,4 @@ else
     var NSGetModule = XPCOMUtils.generateNSGetModule([CommandLineHandler]);
 var EXPORTED_SYMBOLS = ["NSGetFactory", "global"];
 
-// vim: set fdm=marker sw=4 ts=4 et:
+// vim: set fdm=marker sw=4 sts=4 ts=8 et: