diff --git a/common/content/events.js b/common/content/events.js
index 303be2ea..10c38a5d 100644
--- a/common/content/events.js
+++ b/common/content/events.js
@@ -38,7 +38,8 @@ var ProcessorStack = Class("ProcessorStack", {
};
}
- if (!builtin && (!dactyl.focusedElement || events.isContentNode(dactyl.focusedElement)))
+ if (!builtin && options.get("passkeys").hive.values.length
+ && (!dactyl.focusedElement || events.isContentNode(dactyl.focusedElement)))
this.processors.unshift(KeyProcessor(modes.BASE, options.get("passkeys").hive));
},
@@ -1539,11 +1540,13 @@ var Events = Module("events", {
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
});
},
- has: function (key) set.has(this.hive.pass, key),
+ has: function (key) set.has(this.hive.pass, key) || set.has(this.hive.stack.mappings, key),
get hive() (this.flush(), this.hive),
diff --git a/common/modules/config.jsm b/common/modules/config.jsm
index 8913227b..a837700e 100644
--- a/common/modules/config.jsm
+++ b/common/modules/config.jsm
@@ -589,6 +589,8 @@ var ConfigBase = Class("ConfigBase", {
helpCSS: UTF8(<>
+ InlineHelpLink font-size: inherit !important; font-family: inherit !important;
+
Help;;;FontProportional line-height: 1.4em;
HelpArg;;;FontCode color: #6A97D4;
diff --git a/common/modules/template.jsm b/common/modules/template.jsm
index d05b1e63..f42adb9b 100644
--- a/common/modules/template.jsm
+++ b/common/modules/template.jsm
@@ -221,7 +221,7 @@ var Template = Module("Template", {
/^\[.*\]$/.test(token) ? "HelpTopic" :
/^:\w/.test(token) ? "HelpEx" : "HelpKey");
- return {text || topic};
+ return {text || topic};
},
HelpLink: function (token) {
if (!services["dactyl:"].initialized)