Import r6923 from upstream hg supporting Firefox up to 22.0a1

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

diff --git a/common/components/commandline-handler.js b/common/components/commandline-handler.js
index 738e27516d084a8a2f711c7ac28c1a59fe90a0f1..0be89de64a918892be2ac2a70af94beccbefe6eb 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() {