Import 1.0 supporting Firefox up to 14.*

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

diff --git a/common/modules/config.jsm b/common/modules/config.jsm
index c9c1420fba6396ed0edbd3597b141da15a483ecf..f92ea2258989cf5c8b8518303ce7b96aaf257ec4 100644 (file)
--- a/common/modules/config.jsm
+++ b/common/modules/config.jsm
@@ -19,6 +19,7 @@ this.lazyRequire("highlight", ["highlight"]);
 this.lazyRequire("messages", ["_"]);
 this.lazyRequire("prefs", ["localPrefs", "prefs"]);
 this.lazyRequire("storage", ["storage", "File"]);
+this.lazyRequire("styles", ["Styles"]);
 
 function AboutHandler() {}
 AboutHandler.prototype = {
@@ -215,7 +216,8 @@ var ConfigBase = Class("ConfigBase", {
         let jar = io.isJarURL(uri);
         if (jar) {
             let prefix = getDir(jar.JAREntry);
-            var res = iter(s.slice(prefix.length).replace(/\/.*/, "") for (s in io.listJar(jar.JARFile, prefix)))
+            var res = iter(s.slice(prefix.length).replace(/\/.*/, "")
+                           for (s in io.listJar(jar.JARFile, prefix)))
                         .toArray();
         }
         else {
@@ -225,7 +227,7 @@ var ConfigBase = Class("ConfigBase", {
                         if (f.isDirectory())).array;
         }
 
-        function exists(pkg) services["resource:"].hasSubstitution("dactyl-locale-" + pkg);
+        let exists = function exists(pkg) services["resource:"].hasSubstitution("dactyl-locale-" + pkg);
 
         return array.uniq([this.appLocale, this.appLocale.replace(/-.*/, "")]
                             .filter(exists)
@@ -402,11 +404,11 @@ var ConfigBase = Class("ConfigBase", {
 
     dtdDactyl: memoize({
         get name() config.name,
-        get home() "http://dactyl.sourceforge.net/",
+        get home() "http://5digits.org/",
         get apphome() this.home + this.name,
         code: "http://code.google.com/p/dactyl/",
         get issues() this.home + "bug/" + this.name,
-        get plugins() "http://dactyl.sf.net/" + this.name + "/plugins",
+        get plugins() "http://5digits.org/" + this.name + "/plugins",
         get faq() this.home + this.name + "/faq",
 
         "list.mailto": Class.Memoize(function () config.name + "@googlegroups.com"),