Skip to content
Permalink
Browse files
Traversing: Fix contents() on <object>s with children
(cherry-picked from 4d865d9)

Fixes gh-4384
Closes gh-4385
  • Loading branch information
patocallaghan authored and mgol committed May 6, 2019
1 parent 0e3e23d commit 42badf34607092fd754a18f5b71e9b08457f982a
Showing 2 changed files with 14 additions and 1 deletion.
@@ -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;
}

@@ -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 );

0 comments on commit 42badf3

Please sign in to comment.