From 758a4806c2325b0a5fc1aea158ff17a199f3bc5a Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Sat, 6 Jul 2013 14:49:44 -0700
Subject: [PATCH] Fix minor bugs and remove dead code.

--HG--
extra : rebase_source : 2b724d92734c547be0fc808a4e39fde0bc339542
---
 common/modules/buffer.jsm | 5 ++++-
 common/modules/dom.jsm    | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/common/modules/buffer.jsm b/common/modules/buffer.jsm
index c883b3f2..5c812b38 100644
--- a/common/modules/buffer.jsm
+++ b/common/modules/buffer.jsm
@@ -1144,7 +1144,10 @@ var Buffer = Module("Buffer", {
 
             let ext = uri.fileExtension || "txt";
             if (doc.contentType)
-                ext = services.mime.getPrimaryExtension(doc.contentType, ext);
+                try {
+                    ext = services.mime.getPrimaryExtension(doc.contentType, ext);
+                }
+                catch (e) {}
 
             if (!isString(doc))
                 return io.withTempFiles(function (temp) {
diff --git a/common/modules/dom.jsm b/common/modules/dom.jsm
index 61e44469..9bba185d 100644
--- a/common/modules/dom.jsm
+++ b/common/modules/dom.jsm
@@ -125,7 +125,7 @@ var DOM = Class("DOM", {
             if (val instanceof Ci.nsIDOMNode)
                 return val;
 
-            if (typeof val == "xml" || DOM.isJSONXML(val)) {
+            if (DOM.isJSONXML(val)) {
                 val = dom.constructor(val, dom.document);
                 if (container)
                     container[idx] = val[0];
@@ -140,6 +140,9 @@ var DOM = Class("DOM", {
             return val;
         }
 
+        if (DOM.isJSONXML(val))
+            val = (function () this).bind(val);
+
         if (callable(val))
             return this.each(function (elem, i) {
                 util.withProperErrors(fn, this, munge(val.call(this, elem, i)), elem, i);