X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fcore.js;h=5690df16e6f336d3c66c33e6f350eb9abfff4ae9;hb=4515aba79c56b28d9cf7bae902c71fb38763f693;hp=aa233f8830d849925f2f48f6d88a0c1481c7f36b;hpb=f43516f20975d3b3fc7910d187af97d7a8c6dc6f;p=jquery.git diff --git a/src/core.js b/src/core.js index aa233f8..5690df1 100644 --- a/src/core.js +++ b/src/core.js @@ -595,7 +595,7 @@ jQuery.extend = jQuery.fn.extend = function() { // Recurse if we're merging object values if ( deep && options[ name ] && typeof options[ name ] == "object" && target[ name ] && !options[ name ].nodeType ) - target[ name ] = jQuery.extend( target[ name ], options[ name ] ); + target[ name ] = jQuery.extend( deep, target[ name ], options[ name ] ); // Don't bring in undefined values else if ( options[ name ] != undefined ) @@ -1121,7 +1121,7 @@ jQuery.extend({ var ret = []; // Need to use typeof to fight Safari childNodes crashes - if ( typeof array != "array" ) + if ( array.constructor != Array ) for ( var i = 0, length = array.length; i < length; i++ ) ret.push( array[ i ] ); else