From 67079b8f54613e29325aedfe652de0f6618484ab Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Sun, 20 Feb 2011 13:01:02 -0500
Subject: [PATCH] Fix fallout from revision b9e99e213cb9.

Update issue \#293
Fixed.
---
 common/content/events.js    | 8 ++++----
 common/modules/commands.jsm | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/common/content/events.js b/common/content/events.js
index 10c38a5d..a0ed5286 100644
--- a/common/content/events.js
+++ b/common/content/events.js
@@ -38,7 +38,7 @@ var ProcessorStack = Class("ProcessorStack", {
                 };
             }
 
-        if (!builtin && options.get("passkeys").hive.values.length
+        if (!builtin && options.get("passkeys").hive.active
                 && (!dactyl.focusedElement || events.isContentNode(dactyl.focusedElement)))
             this.processors.unshift(KeyProcessor(modes.BASE, options.get("passkeys").hive));
     },
@@ -1534,15 +1534,15 @@ var Events = Module("events", {
                 flush: function flush() {
                     memoize(this, "hive", function hive()
                         let (values = this.value.filter(function (f) f(buffer.documentURI))) {
+                            get active() this.stack.length,
+
                             get: function get(mode, key) this.stack.mappings[key],
 
                             getCandidates: function getCandidates(mode, key) this.stack.candidates[key],
 
                             pass: set(array.flatten(values.map(function (v) v.keys))),
 
-                            stack: MapHive.Stack(values.map(function (v) v.map)),
-
-                            values: values
+                            stack: MapHive.Stack(values.map(function (v) v.map))
                         });
                 },
 
diff --git a/common/modules/commands.jsm b/common/modules/commands.jsm
index bef53e78..d33d906a 100644
--- a/common/modules/commands.jsm
+++ b/common/modules/commands.jsm
@@ -66,7 +66,7 @@ update(CommandOption, {
      * @property {object} The option accepts a boolean argument.
      * @final
      */
-    BOOL: ArgType("boolean", function parseBool(val) Commands.parseBool(val)),
+    BOOL: ArgType("boolean", function parseBoolArg(val) Commands.parseBool(val)),
     /**
      * @property {object} The option accepts a string argument.
      * @final
@@ -76,18 +76,18 @@ update(CommandOption, {
      * @property {object} The option accepts an integer argument.
      * @final
      */
-    INT: ArgType("int", function parseInt(val) parseInt(val)),
+    INT: ArgType("int", function parseIntArg(val) parseInt(val)),
     /**
      * @property {object} The option accepts a float argument.
      * @final
      */
-    FLOAT: ArgType("float", function parseFloat(val) parseFloat(val)),
+    FLOAT: ArgType("float", function parseFloatArg(val) parseFloat(val)),
     /**
      * @property {object} The option accepts a string list argument.
      *     E.g. "foo,bar"
      * @final
      */
-    LIST: ArgType("list", function parseList(arg, quoted) Option.splitList(quoted))
+    LIST: ArgType("list", function parseListArg(arg, quoted) Option.splitList(quoted))
 });
 
 /**