X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fcore.js;h=b105c4c5b9d920a8d35c5cf3e1c8a3e3a313c157;hb=b964e56946c9111d7e53fa1eafb14cab3cd642f2;hp=88c04373d8d819561f20e43d32854066298a80d2;hpb=b953c1d50a2c9a169b7fc47e78c2b8b0acb8a93d;p=jquery.git diff --git a/src/core.js b/src/core.js index 88c0437..b105c4c 100644 --- a/src/core.js +++ b/src/core.js @@ -251,10 +251,15 @@ jQuery.extend = jQuery.fn.extend = function() { if ( deep && copy && typeof copy === "object" && !copy.nodeType ) { var clone; - if( src ) clone = src; - else if( jQuery.isArray(copy) ) clone = [ ]; - else if( jQuery.isObject(copy) ) clone = { }; - else clone = copy; + 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 ); @@ -298,15 +303,15 @@ jQuery.extend({ }, isEmptyObject: function( obj ) { - for(var name in obj) + for ( var name in obj ) { return false; + } return true; }, // check if an element is in a (or is an) XML document isXMLDoc: function( elem ) { - return elem.nodeType === 9 && elem.documentElement.nodeName !== "HTML" || - !!elem.ownerDocument && elem.ownerDocument.documentElement.nodeName !== "HTML"; + return (elem.ownerDocument || elem).documentElement.nodeName !== "HTML"; }, // Evalulates a script in a global context @@ -318,6 +323,7 @@ jQuery.extend({ script = document.createElement("script"); script.type = "text/javascript"; + if ( jQuery.support.scriptEval ) { script.appendChild( document.createTextNode( data ) ); } else {