deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Tweaked the isXMLDoc iframe test case to test the document, not the body element (which doesn't exist in IE). Also made the isXMLDoc code handle cases where elem is null, undefined, etc.

Browse source
This commit is contained in:
John Resig 2009-08-27 19:22:48 +00:00
parent f52c4a3d5f
commit 957cd6fb2a
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/core.js
View file

@ -316,7 +316,7 @@ jQuery.extend({
isXMLDoc: function( elem ) { isXMLDoc: function( elem ) {
// documentElement is verified for cases where it doesn't yet exist // documentElement is verified for cases where it doesn't yet exist
// (such as loading iframes in IE - #4833) // (such as loading iframes in IE - #4833)
return ((elem.ownerDocument || elem).documentElement || 0).nodeName !== "HTML"; return ((elem ? elem.ownerDocument || elem : 0).documentElement || 0).nodeName !== "HTML";
}, },
// Evalulates a script in a global context // Evalulates a script in a global context

6
test/unit/core.js
View file

@ -280,10 +280,10 @@ test("isXMLDoc - HTML", function() {
document.body.appendChild( iframe ); document.body.appendChild( iframe );
try { try {
var body = jQuery(iframe).contents().find("body")[0]; var body = jQuery(iframe).contents()[0];
ok( !jQuery.isXMLDoc( body ), "Iframe body element" ); ok( jQuery.isXMLDoc( body ), "Iframe body element" );
} catch(e){ } catch(e){
ok( false, "Iframe body element" ); ok( false, "Iframe body element exception" );
} }
document.body.removeChild( iframe ); document.body.removeChild( iframe );