X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fcore.js;h=bd6d929d5a4277dc96690efbb19a1b6a75de56b6;hb=a73445bbc7a68c3bf3cae8cee23bb757295eaacb;hp=4c12150dbb1dc239ca31482b8f636b0f77544e84;hpb=95c0265486fc551a08ec20d6060a3a382aa8a76b;p=jquery.git diff --git a/src/core.js b/src/core.js index 4c12150..bd6d929 100644 --- a/src/core.js +++ b/src/core.js @@ -530,7 +530,7 @@ jQuery.extend = jQuery.fn.extend = function() { } // Handle case when target is a string or something (possible in deep copy) - if ( typeof target != "object" ) + if ( typeof target != "object" && typeof target != "function" ) target = {}; // extend jQuery itself if only one argument is passed @@ -553,7 +553,7 @@ jQuery.extend = jQuery.fn.extend = function() { 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 ]; } @@ -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 );