X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fcore.js;h=74b9fee3992ffa0eee504127684af3ae12bc764f;hb=190812c3be99bde536d373b6b6ab65cfe053a532;hp=1721bdacf7bb46136735d4b89392e65b251aacb8;hpb=e532dfe5228217f55a33122a4438fd70522dbb4b;p=jquery.git diff --git a/src/core.js b/src/core.js index 1721bda..74b9fee 100644 --- a/src/core.js +++ b/src/core.js @@ -243,9 +243,15 @@ jQuery.extend = jQuery.fn.extend = function() { // Recurse if we're merging object values if ( deep && copy && typeof copy === "object" && !copy.nodeType ) { - target[ name ] = jQuery.extend( deep, - // Never move original objects, clone them - src || ( copy.length != null ? [ ] : { } ), copy ); + var clone; + + if( src ) clone = src; + else if( jQuery.isArray(copy) ) clone = [ ]; + else if( jQuery.isObject(copy) ) clone = { }; + else clone = copy; + + // Never move original objects, clone them + target[ name ] = jQuery.extend( deep, clone, copy ); // Don't bring in undefined values } else if ( copy !== undefined ) { @@ -281,6 +287,16 @@ jQuery.extend({ return toString.call(obj) === "[object Array]"; }, + isObject: function( obj ) { + return this.constructor.call(obj) === Object; + }, + + isEmptyObject: function( obj ) { + var name = ""; + for(name in obj) break; + return !name; + }, + // check if an element is in a (or is an) XML document isXMLDoc: function( elem ) { return elem.nodeType === 9 && elem.documentElement.nodeName !== "HTML" ||