gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-03-07 22:55:46 +01:00
Code Issues Projects Releases Wiki Activity

Fix fallout from revision b9e99e213cb9.

Browse Source 
Update issue \#293
Fixed.
This commit is contained in:
Kris Maglione
2011-02-20 13:01:02 -05:00
parent 321296e7e5
commit 67079b8f54
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
common/content/events.js
View File

@@ -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))) && (!dactyl.focusedElement || events.isContentNode(dactyl.focusedElement)))
this.processors.unshift(KeyProcessor(modes.BASE, options.get("passkeys").hive)); this.processors.unshift(KeyProcessor(modes.BASE, options.get("passkeys").hive));
}, },
@@ -1534,15 +1534,15 @@ var Events = Module("events", {
flush: function flush() { flush: function flush() {
memoize(this, "hive", function hive() memoize(this, "hive", function hive()
let (values = this.value.filter(function (f) f(buffer.documentURI))) { let (values = this.value.filter(function (f) f(buffer.documentURI))) {
get active() this.stack.length,
get: function get(mode, key) this.stack.mappings[key], get: function get(mode, key) this.stack.mappings[key],
getCandidates: function getCandidates(mode, key) this.stack.candidates[key], getCandidates: function getCandidates(mode, key) this.stack.candidates[key],
pass: set(array.flatten(values.map(function (v) v.keys))), pass: set(array.flatten(values.map(function (v) v.keys))),
stack: MapHive.Stack(values.map(function (v) v.map)), stack: MapHive.Stack(values.map(function (v) v.map))
values: values
}); });
}, },

8
common/modules/commands.jsm
View File

@@ -66,7 +66,7 @@ update(CommandOption, {
* @property {object} The option accepts a boolean argument. * @property {object} The option accepts a boolean argument.
* @final * @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. * @property {object} The option accepts a string argument.
* @final * @final
@@ -76,18 +76,18 @@ update(CommandOption, {
* @property {object} The option accepts an integer argument. * @property {object} The option accepts an integer argument.
* @final * @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. * @property {object} The option accepts a float argument.
* @final * @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. * @property {object} The option accepts a string list argument.
* E.g. "foo,bar" * E.g. "foo,bar"
* @final * @final
*/ */
LIST: ArgType("list", function parseList(arg, quoted) Option.splitList(quoted)) LIST: ArgType("list", function parseListArg(arg, quoted) Option.splitList(quoted))
}); });
/** /**