From d8515c154886ae18282544e19ad8f137626509ca Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Sun, 16 Dec 2012 21:35:20 -0800
Subject: [PATCH] Death to E4X and stuff.

---
 common/content/dactyl.js    | 9 +++++----
 common/modules/contexts.jsm | 4 +++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/common/content/dactyl.js b/common/content/dactyl.js
index aea35ab7..5130f915 100644
--- a/common/content/dactyl.js
+++ b/common/content/dactyl.js
@@ -16,7 +16,8 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
     init: function () {
         window.dactyl = this;
         // cheap attempt at compatibility
-        let prop = { get: deprecated("dactyl", function liberator() dactyl) };
+        let prop = { get: deprecated("dactyl", function liberator() dactyl),
+                     configurable: true };
         Object.defineProperty(window, "liberator", prop);
         Object.defineProperty(modules, "liberator", prop);
         this.commands = {};
@@ -108,7 +109,7 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
 
     signals: {
         "io.source": function ioSource(context, file, modTime) {
-            if (context.INFO)
+            if (contexts.getDocs(context))
                 help.flush("help/plugins.xml", modTime);
         }
     },
@@ -1243,8 +1244,8 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
                                     if (attr in elem[1])
                                         info[attr] = elem[1][attr];
                         }
-                        body.push(["h2", { xmlns: "dactyl", tag: info.name + '-plugin' },
-                                       String(info.summary)]);
+                        body.push(["h2", { xmlns: "dactyl", tag: info[1].name + '-plugin' },
+                                       String(info[1].summary)]);
                         body.push(info);
                     }
                 }
diff --git a/common/modules/contexts.jsm b/common/modules/contexts.jsm
index beb471b0..a9d4fd1d 100644
--- a/common/modules/contexts.jsm
+++ b/common/modules/contexts.jsm
@@ -486,7 +486,9 @@ var Contexts = Module("contexts", {
                 let info = "INFO" in context && Cu.evalInSandbox("this.INFO instanceof XML ? INFO.toXMLString() : this.INFO", context);
                 return /^</.test(info) ? XML(info) : info;
             }
-            if (typeof context.INFO == "xml" || DOM.isJSONXML(context.INFO))
+            if (DOM.isJSONXML(context.INFO))
+                return context.INFO;
+            if (typeof context.INFO == "xml" && config.haveGecko(null, "14.*"))
                 return context.INFO;
         }
         catch (e) {}