Release Pentadactyl 1.0b7.1

.hgtags

@@ -25,3 +25,4 @@ d783bcace8c6a24bee7bd22ead22fe44baaebe90 pentadactyl-1.0b4.3
 b83bb8e6d273f71b1278c4ee03376594ad6dd039 pentadactyl-1.0b6
 0000000000000000000000000000000000000000 vimperator-2.2~beta1
 0000000000000000000000000000000000000000 vimperator-2.0~alpha1
+2281deb4c1323643dfc130c43d79f1a14f4a761a pentadactyl-1.0b7

common/bootstrap.js

@@ -29,6 +29,8 @@ const resourceProto = Services.io.getProtocolHandler("resource")
 const categoryManager = Cc["@mozilla.org/categorymanager;1"].getService(Ci.nsICategoryManager);
 const manager = Components.manager.QueryInterface(Ci.nsIComponentRegistrar);
 
+const BOOTSTRAP_JSM = "resource://dactyl/bootstrap.jsm";
+
 const BOOTSTRAP_CONTRACT = "@dactyl.googlecode.com/base/bootstrap";
 JSMLoader = JSMLoader || BOOTSTRAP_CONTRACT in Cc && Cc[BOOTSTRAP_CONTRACT].getService().wrappedJSObject.loader;
 
@@ -194,16 +196,23 @@ function init() {
         reportError(e);
     }
 
-    if (JSMLoader && JSMLoader.bump !== 4) // Temporary hack
-        Services.scriptloader.loadSubScript("resource://dactyl" + suffix + "/bootstrap.jsm",
-            Cu.import("resource://dactyl/bootstrap.jsm", global));
+    if (JSMLoader) {
+        if (Cu.unload) {
+            Cu.unload(BOOTSTRAP_JSM);
+            for (let [name] in Iterator(JSMLoader.globals))
+                Cu.unload(~name.indexOf(":") ? name : "resource://dactyl" + JSMLoader.suffix + "/" + name);
+        }
+        else if (JSMLoader.bump != 5) // Temporary hack
+            Services.scriptloader.loadSubScript("resource://dactyl" + suffix + "/bootstrap.jsm",
+                Cu.import(BOOTSTRAP_JSM, global));
+    }
 
-    if (!JSMLoader || JSMLoader.bump !== 4)
-        Cu.import("resource://dactyl/bootstrap.jsm", global);
+    if (!JSMLoader || JSMLoader.bump !== 5 || Cu.unload)
+        Cu.import(BOOTSTRAP_JSM, global);
 
     JSMLoader.bootstrap = this;
 
-    JSMLoader.load("resource://dactyl/bootstrap.jsm", global);
+    JSMLoader.load(BOOTSTRAP_JSM, global);
 
     JSMLoader.init(suffix);
     JSMLoader.load("base.jsm", global);

common/content/abbreviations.js

@@ -376,8 +376,9 @@ var Abbreviations = Module("abbreviations", {
         }
 
         addAbbreviationCommands([modes.INSERT, modes.COMMAND_LINE], "", "");
-        addAbbreviationCommands([modes.INSERT], "i", "INSERT");
-        addAbbreviationCommands([modes.COMMAND_LINE], "c", "COMMAND_LINE");
+        [modes.INSERT, modes.COMMAND_LINE].forEach(function (mode) {
+            addAbbreviationCommands([mode], mode.char, mode.displayName);
+        });
     }
 });
 

common/content/mappings.js

@@ -753,7 +753,7 @@ var Mappings = Module("mappings", {
                                     ({ helpTag: prefix + map.name, __proto__: map }
                                      for (map in self.iterate(args, true))
                                      if (map.hive === mappings.builtin || Set.has(tags, prefix + map.name))),
-                    description: "List all " + mode.name + " mode mappings along with their short descriptions",
+                    description: "List all " + mode.displayName + " mode mappings along with their short descriptions",
                     index: mode.char + "-map",
                     getMode: function (args) mode,
                     options: []

common/modules/bootstrap.jsm

@@ -19,11 +19,11 @@ if (!JSMLoader && "@mozilla.org/fuel/application;1" in Components.classes)
                           .getService(Components.interfaces.extIApplication)
                           .storage.get("dactyl.JSMLoader", null);
 
-if (JSMLoader && JSMLoader.bump === 4)
+if (JSMLoader && JSMLoader.bump === 5)
     JSMLoader.global = this;
 else
     JSMLoader = {
-        bump: 4,
+        bump: 5,
 
         builtin: Cu.Sandbox(this),
 
@@ -41,7 +41,7 @@ else
 
         manager: Components.manager.QueryInterface(Ci.nsIComponentRegistrar),
 
-        modules: JSMLoader ? JSMLoader.modules : {},
+        modules: JSMLoader && JSMLoader.modules || {},
 
         stale: JSMLoader ? JSMLoader.stale : {},
 

common/modules/prefs.jsm

@@ -31,9 +31,9 @@ var Prefs = Module("prefs", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference])
 
         this.branches = memoize({
             __proto__: this,
-            get original() Prefs(this.ORIGINAL + this.root),
-            get restore() Prefs(this.RESTORE + this.root),
-            get saved() Prefs(this.SAVED + this.root),
+            get original() this.constructor(this.ORIGINAL + this.root),
+            get restore() this.constructor(this.RESTORE + this.root),
+            get saved() this.constructor(this.SAVED + this.root),
         });
 
         if (!defaults)

pentadactyl/install.rdf

@@ -5,7 +5,7 @@
         em:id="pentadactyl@dactyl.googlecode.com"
         em:type="2"
         em:name="Pentadactyl"
-        em:version="1.0b7"
+        em:version="1.0b7.1"
         em:description="Firefox for Vim and Links addicts"
         em:homepageURL="http://dactyl.sourceforge.net/pentadactyl"
         em:iconURL="resource://dactyl-local-skin/icon.png"
@@ -32,7 +32,7 @@
             <Description
                 em:id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
                 em:minVersion="3.6"
-                em:maxVersion="8.0a1"/>
+                em:maxVersion="8.*"/>
         </em:targetApplication>
     </Description>
 </RDF>