X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcore.js;h=0bf353074edc2f6c262ce85fc8042474591cef00;hb=aca1cc367782f8d038a13794a46aec6fd825eb45;hp=39aa65be4523d9d2fa41275384bd4ff28df2e19b;hpb=ed7608d8eedc0cd9082b5246581c0fc4ccb392db;p=jquery.git diff --git a/src/core.js b/src/core.js index 39aa65b..0bf3530 100644 --- a/src/core.js +++ b/src/core.js @@ -549,7 +549,7 @@ 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 @@ -591,7 +591,6 @@ jQuery.extend({ }, // Evalulates a script in a global context - // Evaluates Async. in Safari 2 :-( globalEval: function( data ) { data = jQuery.trim( data );