From 569c8b45c0d301663f3f6c88b606d199fc78ec1a Mon Sep 17 00:00:00 2001
From: John Resig <jeresig@gmail.com>
Date: Thu, 27 Aug 2009 20:07:45 +0000
Subject: [PATCH] Fixed a bug with the isXMLDoc test - also made sure that
isXMLDoc was handling the case where documentElement is
undefined (which only occurs on HTML documents in IE).
---
src/core.js | 3 ++-
test/unit/core.js | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/core.js b/src/core.js
index 23b9644..c8b5a46 100644
--- a/src/core.js
+++ b/src/core.js
@@ -316,7 +316,8 @@ jQuery.extend({
isXMLDoc: function( elem ) {
// documentElement is verified for cases where it doesn't yet exist
// (such as loading iframes in IE - #4833)
- return ((elem ? elem.ownerDocument || elem : 0).documentElement || 0).nodeName !== "HTML";
+ var documentElement = (elem ? elem.ownerDocument || elem : 0).documentElement;
+ return documentElement ? documentElement.nodeName !== "HTML" : false;
},
// Evalulates a script in a global context
diff --git a/test/unit/core.js b/test/unit/core.js
index 8decd49..46858ce 100644
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -281,7 +281,7 @@ test("isXMLDoc - HTML", function() {
try {
var body = jQuery(iframe).contents()[0];
- ok( jQuery.isXMLDoc( body ), "Iframe body element" );
+ ok( !jQuery.isXMLDoc( body ), "Iframe body element" );
} catch(e){
ok( false, "Iframe body element exception" );
}
--
1.7.10.4