Import 1.0b7.1 supporting Firefox up to 8.*

[dactyl.git] / common / modules / overlay.jsm

diff --git a/common/modules/overlay.jsm b/common/modules/overlay.jsm
index ea626b4c5c08c85cc4a4090ffef0770664904820..08c2829d774415219aefdf05a627d3b61199bed5 100644 (file)
--- a/common/modules/overlay.jsm
+++ b/common/modules/overlay.jsm
@@ -9,7 +9,7 @@ try {
 Components.utils.import("resource://dactyl/bootstrap.jsm");
 defineModule("overlay", {
     exports: ["ModuleBase"],
-    require: ["config", "services", "util"]
+    require: ["config", "io", "services", "util"]
 }, this);
 
 /**
@@ -206,8 +206,8 @@ var Overlay = Module("Overlay", {
 
                 const start = Date.now();
                 const deferredInit = { load: {} };
-                const seen = set();
-                const loaded = set();
+                const seen = Set();
+                const loaded = Set();
                 modules.loaded = loaded;
 
                 function load(module, prereq, frame) {
@@ -222,7 +222,7 @@ var Overlay = Module("Overlay", {
                             return;
                         if (module.className in seen)
                             throw Error("Module dependency loop.");
-                        set.add(seen, module.className);
+                        Set.add(seen, module.className);
 
                         for (let dep in values(module.requires))
                             load(Module.constructors[dep], module.className);
@@ -275,9 +275,9 @@ var Overlay = Module("Overlay", {
                     });
                 }
                 defineModule.modules.forEach(function defModule(mod) {
-                    let names = set(Object.keys(mod.INIT));
+                    let names = Set(Object.keys(mod.INIT));
                     if ("init" in mod.INIT)
-                        set.add(names, "init");
+                        Set.add(names, "init");
 
                     keys(names).forEach(function (name) { deferInit(name, mod.INIT, mod); });
                 });