From 6a0b0c529b8ebe7cf602fe3199acc46ea578c368 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Mon, 10 Jan 2011 12:47:05 -0500
Subject: [PATCH] Fix dactyl.initHelp.

--HG--
extra : rebase_source : 5b25fc441e0d0bc7c22820149c73beef4e702e70
---
 common/content/dactyl.js | 46 ++++++++++++++++++++--------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/common/content/dactyl.js b/common/content/dactyl.js
index 1e98ec71..0388c259 100644
--- a/common/content/dactyl.js
+++ b/common/content/dactyl.js
@@ -534,35 +534,35 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
      * Initialize the help system.
      */
     initHelp: function (force) {
-        // Find help and overlay files with the given name.
-        function findHelpFile(file) {
-            let result = [];
-            for (let [, namespace] in Iterator(namespaces)) {
-                let url = ["dactyl://", namespace, "/", file, ".xml"].join("");
-                let res = util.httpGet(url);
-                if (res) {
-                    if (res.responseXML.documentElement.localName == "document")
-                        fileMap[file] = url;
-                    if (res.responseXML.documentElement.localName == "overlay")
-                        overlayMap[file] = url;
-                    result.push(res.responseXML);
-                }
-            }
-            return result;
-        }
-        // Find the tags in the document.
-        function addTags(file, doc) {
-            for (let elem in util.evaluateXPath("//@tag|//dactyl:tags/text()|//dactyl:tag/text()", doc))
-                for (let tag in values((elem.value || elem.textContent).split(/\s+/)))
-                    tagMap[tag] = file;
-        }
-
         if (!force && !this.helpInitialized) {
             if ("noscriptOverlay" in window) {
                 noscriptOverlay.safeAllow("chrome-data:", true, false);
                 noscriptOverlay.safeAllow("dactyl:", true, false);
             }
 
+            // Find help and overlay files with the given name.
+            let findHelpFile = function findHelpFile(file) {
+                let result = [];
+                for (let [, namespace] in Iterator(namespaces)) {
+                    let url = ["dactyl://", namespace, "/", file, ".xml"].join("");
+                    let res = util.httpGet(url);
+                    if (res) {
+                        if (res.responseXML.documentElement.localName == "document")
+                            fileMap[file] = url;
+                        if (res.responseXML.documentElement.localName == "overlay")
+                            overlayMap[file] = url;
+                        result.push(res.responseXML);
+                    }
+                }
+                return result;
+            }
+            // Find the tags in the document.
+            let addTags = function addTags(file, doc) {
+                for (let elem in util.evaluateXPath("//@tag|//dactyl:tags/text()|//dactyl:tag/text()", doc))
+                    for (let tag in values((elem.value || elem.textContent).split(/\s+/)))
+                        tagMap[tag] = file;
+            }
+
             var namespaces = ["locale-local", "locale"];
             services["dactyl:"].init({});