X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fcore.js;h=6308a99929ed0744d427e2c96d6deb43ba54847f;hb=2efd0b4cc5cce9b22cd4bc638e25cc998736b6e7;hp=aa233f8830d849925f2f48f6d88a0c1481c7f36b;hpb=f43516f20975d3b3fc7910d187af97d7a8c6dc6f;p=jquery.git

diff --git a/src/core.js b/src/core.js
index aa233f8..6308a99 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 )
@@ -611,6 +611,8 @@ var expando = "jQuery" + (new Date()).getTime(), uuid = 0, windowData = {};
 
 // exclude the following css properties to add px
 var exclude = /z-?index|font-?weight|opacity|zoom|line-?height/i;
+// cache getComputedStyle
+var getComputedStyle = document.defaultView && document.defaultView.getComputedStyle;
 
 jQuery.extend({
 	noConflict: function( deep ) {
@@ -837,8 +839,9 @@ jQuery.extend({
 		function color( elem ) {
 			if ( !jQuery.browser.safari )
 				return false;
-
-			var ret = document.defaultView.getComputedStyle( elem, null );
+			
+			// getComputedStyle is cached
+			var ret = getComputedStyle( elem, null );
 			return !ret || ret.getPropertyValue("color") == "";
 		}
 
@@ -864,7 +867,7 @@ jQuery.extend({
 		if ( !force && elem.style && elem.style[ name ] )
 			ret = elem.style[ name ];
 
-		else if ( document.defaultView && document.defaultView.getComputedStyle ) {
+		else if ( getComputedStyle ) {
 
 			// Only "float" is needed here
 			if ( name.match( /float/i ) )
@@ -872,10 +875,10 @@ jQuery.extend({
 
 			name = name.replace( /([A-Z])/g, "-$1" ).toLowerCase();
 
-			var getComputedStyle = document.defaultView.getComputedStyle( elem, null );
+			var computedStyle = getComputedStyle( elem, null );
 
-			if ( getComputedStyle && !color( elem ) )
-				ret = getComputedStyle.getPropertyValue( name );
+			if ( computedStyle && !color( elem ) )
+				ret = computedStyle.getPropertyValue( name );
 
 			// If the element isn't reporting its values properly in Safari
 			// then some display: none elements are involved
@@ -898,7 +901,7 @@ jQuery.extend({
 				// one special, otherwise get the value
 				ret = name == "display" && swap[ stack.length - 1 ] != null ?
 					"none" :
-					( getComputedStyle && getComputedStyle.getPropertyValue( name ) ) || "";
+					( computedStyle && computedStyle.getPropertyValue( name ) ) || "";
 
 				// Finally, revert the display styles back
 				for ( var i = 0; i < swap.length; i++ )
@@ -1121,7 +1124,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