Import r6948 from upstream hg supporting Firefox up to 24.*

[dactyl.git] / common / modules / help.jsm

diff --git a/common/modules/help.jsm b/common/modules/help.jsm
index a092ad5c8a71fc02de197919eda53dd9b58b6957..623aeca1a6844dbd06842dc01095b43b48da5a3a 100644 (file)
--- a/common/modules/help.jsm
+++ b/common/modules/help.jsm
@@ -131,12 +131,10 @@ var Help = Module("Help", {
             let beta = array(betas.iterate(NEWS))
                         .map(function (m) m[1]).uniq().slice(-1)[0];
 
-
             function rec(text, level, li) {
                 let res = [];
                 let list, space, i = 0;
 
-
                 for (let match in re.iterate(text)) {
                     if (match.comment)
                         continue;
@@ -195,7 +193,6 @@ var Help = Module("Help", {
             //     }
             // }
 
-
             return '<?xml version="1.0"?>\n' +
                    '<?xml-stylesheet type="text/xsl" href="dactyl://content/help.xsl"?>\n' +
                    DOM.toXML(["document", { xmlns: "dactyl", name: "versions",
@@ -448,9 +445,16 @@ var Help = Module("Help", {
     javascript: function initJavascript(dactyl, modules, window) {
         modules.JavaScript.setCompleter([modules.help.exportHelp],
             [function (context, args) overlay.activeModules.completion.file(context)]);
+    },
+    options: function initOptions(dactyl, modules, window) {
+        const { options } = modules;
+
+        options.add(["helpfile", "hf"],
+            "Name of the main help file",
+            "string", "intro");
     }
 });
 
 endModule();
 
-// vim: set fdm=marker sw=4 ts=4 et ft=javascript:
+// vim: set fdm=marker sw=4 sts=4 ts=8 et ft=javascript: