diff --git a/common/content/about.xul b/common/content/about.xul index aba640b3..7c1aa158 100644 --- a/common/content/about.xul +++ b/common/content/about.xul @@ -20,7 +20,7 @@ by Kris Maglione, Doug Kearns, et al. &dactyl.appName; is open source and freely distributable type :q<Enter> to exit -type :help<Enter> or <F1> for on-line help +type :help<Enter> for on-line help type :help faq<Enter> for the FAQ page type :help versions<Enter> for version info diff --git a/common/content/commandline.js b/common/content/commandline.js index fdd065a1..1b79155a 100644 --- a/common/content/commandline.js +++ b/common/content/commandline.js @@ -2291,7 +2291,7 @@ var ItemList = Class("ItemList", { DOM(this.nodes.message).empty() .append(DOM.fromJSON(this.context.message, this.doc)); - if (!this.selectedIdx > this.itemCount) + if (this.selectedIdx > this.itemCount) this.selectedIdx = null; }, diff --git a/common/content/events.js b/common/content/events.js index 8ca6206d..98dc0281 100644 --- a/common/content/events.js +++ b/common/content/events.js @@ -661,13 +661,15 @@ var Events = Module("events", { let duringFeed = this.duringFeed || []; this.duringFeed = []; try { - if (DOM.Event.feedingEvent) - for (let [k, v] in Iterator(DOM.Event.feedingEvent)) + let ourEvent = DOM.Event.feedingEvent; + DOM.Event.feedingEvent = null; + if (ourEvent) + for (let [k, v] in Iterator(ourEvent)) if (!(k in event)) event[k] = v; - DOM.Event.feedingEvent = null; - let key = DOM.Event.stringify(event); + let key = DOM.Event.stringify(ourEvent || event); + event.dactylString = key; // Hack to deal with and so forth not dispatching input // events diff --git a/common/content/key-processors.js b/common/content/key-processors.js index a0607488..aa1e016d 100644 --- a/common/content/key-processors.js +++ b/common/content/key-processors.js @@ -159,7 +159,7 @@ var ProcessorStack = Class("ProcessorStack", { if (this.timer) this.timer.cancel(); - let key = DOM.Event.stringify(event); + let key = event.dactylString || DOM.Event.stringify(event); this.events.push(event); if (this.keyEvents) this.keyEvents.push(event); @@ -233,7 +233,7 @@ var KeyProcessor = Class("KeyProcessor", { append: function append(event) { this.events.push(event); - let key = DOM.Event.stringify(event); + let key = event.dactylString || DOM.Event.stringify(event); if (this.wantCount && !this.command && (this.countStr ? /^[0-9]$/ : /^[1-9]$/).test(key)) diff --git a/common/locale/en-US/developer.xml b/common/locale/en-US/developer.xml index 40a03e59..1c1ae732 100644 --- a/common/locale/en-US/developer.xml +++ b/common/locale/en-US/developer.xml @@ -24,9 +24,8 @@

- <F1> :help :h help + :help :h help :help subject - <F1>

Open the help page. The default page, as specified by helpfile is shown @@ -37,11 +36,11 @@

- creates a new help section for the command :help and for - the related key binding, . It also creates help tags - for the command, its shortcuts, the key binding, and the general - topic, ‘help’. These tags enable linking to this section from - other mentions of the topic and from the :help command. + creates a new help section for the command :help. It + also creates help tags for the command, its shortcuts, the key + binding, and the general topic, ‘help’. These tags enable + linking to this section from other mentions of the topic and + from the :help command.

Help tags

diff --git a/common/modules/addons.jsm b/common/modules/addons.jsm index 9428a470..741c07e9 100644 --- a/common/modules/addons.jsm +++ b/common/modules/addons.jsm @@ -217,7 +217,7 @@ var Addon = Class("Addon", { while (node.firstChild) node.removeChild(node.firstChild); - DOM(node).append(isArray(xml) || isXML(xml) ? xml : DOM.DOMString(xml)); + DOM(node).append(isArray(xml) ? xml : DOM.DOMString(xml)); } update("name", template.icon({ icon: this.iconURL }, this.name)); diff --git a/common/modules/help.jsm b/common/modules/help.jsm index 30d676cb..a092ad5c 100644 --- a/common/modules/help.jsm +++ b/common/modules/help.jsm @@ -445,17 +445,6 @@ var Help = Module("Help", { context.keys = { text: 0, description: function () "all" }; }; }, - mappings: function initMappings(dactyl, modules, window) { - const { help, mappings, modes } = modules; - - mappings.add([modes.MAIN], ["", ""], - "Open the introductory help page", - function () { help.help(); }); - - mappings.add([modes.MAIN], ["", ""], - "Open the single, consolidated help page", - function () { modules.ex.helpall(); }); - }, javascript: function initJavascript(dactyl, modules, window) { modules.JavaScript.setCompleter([modules.help.exportHelp], [function (context, args) overlay.activeModules.completion.file(context)]);