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

Fixed #1908 by testing to make sure it isn't null before checking the nodeType.

Browse source
This commit is contained in:
David Serduke 2007-11-28 23:42:16 +00:00
parent ed7608d8ee
commit 95c0265486
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/core.js
View file

@ -549,11 +549,11 @@ jQuery.extend = jQuery.fn.extend = function() {
continue;
// Recurse if we're merging object values
if ( deep && typeof options[ name ] == "object" && target[ name ] && !options[ name ].nodeType )
if ( deep && options[ name ] && typeof options[ name ] == "object" && target[ name ] && !options[ name ].nodeType )
target[ name ] = jQuery.extend( target[ name ], options[ name ] );
// Don't bring in undefined values
else if ( options[ name ] != undefined )
else if ( options[ name ] !== undefined )
target[ name ] = options[ name ];
}