From 415386a183cb15de80ddc35ff49be620423333ca Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Sun, 9 Jan 2011 15:58:46 -0500
Subject: [PATCH] Fix some accidentally committed code.

---
 common/modules/base.jsm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/modules/base.jsm b/common/modules/base.jsm
index 823a17b3..d0fbdc51 100644
--- a/common/modules/base.jsm
+++ b/common/modules/base.jsm
@@ -22,7 +22,6 @@ if (!JSMLoader || JSMLoader.bump != 1)
         load: function load(url, target) {
             let stale = this.stale[url];
             if (stale) {
-                dump("dactyl: JSMLoader: stale: " + url + " " + stale + "\n");
                 delete this.stale[url];
 
                 let global = this.globals[url];
@@ -38,12 +37,13 @@ if (!JSMLoader || JSMLoader.bump != 1)
                         Components.utils.reportError(e);
                     }
 
-                Components.classes["@mozilla.org/moz/jssubscript-loader;1"]
-                          .getService(Components.interfaces.mozIJSSubScriptLoader)
-                          .loadSubScript(url, global);
+                if (stale === this.getTarget(url))
+                    Components.classes["@mozilla.org/moz/jssubscript-loader;1"]
+                              .getService(Components.interfaces.mozIJSSubScriptLoader)
+                              .loadSubScript(url, global);
             }
 
-            let global = Components.utils.import(moduleUrl, target);
+            let global = Components.utils.import(url, target);
             return this.globals[url] = global;
         },
         cleanup: function unregister() {