Traversing: Fix contents() on <object>s with children

patocallaghan · mgol · commit 4d865d96aa5a · 2019-05-06T19:23:00.000+02:00
Fixes gh-4384 Closes gh-4385
diff --git a/src/traversing.js b/src/traversing.js
@@ -145,7 +145,7 @@ jQuery.each( {
 		return siblings( elem.firstChild );
 	},
 	contents: function( elem ) {
-		if ( typeof elem.contentDocument !== "undefined" ) {
+		if ( elem.contentDocument != null ) {
 			return elem.contentDocument;
 		}
 
diff --git a/test/unit/traversing.js b/test/unit/traversing.js
@@ -808,6 +808,19 @@ QUnit.test( "contents() for <object />", function( assert ) {
 	jQuery( "#qunit-fixture" ).append( svgObject );
 } );
 
+QUnit.test( "contents() for <object /> with children", function( assert ) {
+	assert.expect( 1 );
+
+	var object = "<object type='application/x-shockwave-flash' width='200' height='300' id='penguin'>" +
+		"<param name='movie' value='flash/penguin.swf'>" +
+		"<param name='quality' value='high'>" +
+		"<img src='images/penguin.jpg' width='200' height='300' alt='Penguin'>" +
+	"</object>";
+
+	var contents = jQuery( object ).contents();
+	assert.equal( contents.length, 3, "Check object contents children are correct" );
+} );
+
 QUnit.test( "contents() for <frame />", function( assert ) {
 	assert.expect( 2 );
 

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ jQuery.each( {`
`145`	`145`	`return siblings( elem.firstChild );`
`146`	`146`	`},`
`147`	`147`	`contents: function( elem ) {`
`148`		`- if ( typeof elem.contentDocument !== "undefined" ) {`
	`148`	`+ if ( elem.contentDocument != null ) {`
`149`	`149`	`return elem.contentDocument;`
`150`	`150`	`}`
`151`	`151`