X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fcore.js;h=fedd292750138ea6c2bd8dea3f90a1caae3d4301;hb=54867a98033d7c1d2811308861ea5a92ef80ad4b;hp=a0533b178222d28712e30d659152a81d0e4d4eff;hpb=3f5ff3097c315456fe92c9b1e4578590e1eb8648;p=jquery.git

diff --git a/src/core.js b/src/core.js
index a0533b1..fedd292 100644
--- a/src/core.js
+++ b/src/core.js
@@ -579,8 +579,11 @@ jQuery.extend = jQuery.fn.extend = function() {
 					continue;
 
 				// Recurse if we're merging object values
-				if ( deep && copy && typeof copy == "object" && src && !copy.nodeType )
-					target[ name ] = jQuery.extend( deep, src, copy );
+				if ( deep && copy && typeof copy == "object" && !copy.nodeType )
+					target[ name ] = jQuery.extend( deep, 
+						// Never move original objects, clone them
+						src || ( copy.length != null ? [ ] : { } )
+					, copy );
 
 				// Don't bring in undefined values
 				else if ( copy !== undefined )
@@ -612,7 +615,7 @@ jQuery.extend({
 	// See test/unit/core.js for details concerning this function.
 	isFunction: function( fn ) {
 		return !!fn && typeof fn != "string" && !fn.nodeName &&
-			fn.constructor != Array && /function/i.test( fn + "" );
+			fn.constructor != Array && /^[\s[]?function/.test( fn + "" );
 	},
 
 	// check if an element is in a (or is an) XML document
@@ -1146,17 +1149,17 @@ jQuery.extend({
 	merge: function( first, second ) {
 		// We have to loop this way because IE & Opera overwrite the length
 		// expando of getElementsByTagName
-		var i = 0;
+		var i = 0, elem, pos = first.length;
 		// Also, we need to make sure that the correct elements are being returned
 		// (IE returns comment nodes in a '*' query)
 		if ( jQuery.browser.msie ) {
-			for ( ; second[ i ]; i++ )
-				if ( second[ i ].nodeType != 8 )
-					first.push( second[ i ] );
+			while ( elem = second[ i++ ] )
+				if ( elem.nodeType != 8 )
+					first[ pos++ ] = elem;
 
 		} else
-			for ( ; second[ i ]; i++ )
-				first.push( second[ i ] );
+			while ( elem = second[ i++ ] )
+				first[ pos++ ] = elem;
 
 		return first;
 	},
@@ -1356,3 +1359,8 @@ jQuery.each([ "Height", "Width" ], function(i, name){
 					this.css( type, size.constructor == String ? size : size + "px" );
 	};
 });
+
+// Helper function used by the dimensions and offset modules
+function num(elem, prop) {
+	return elem[0] && parseInt( jQuery.curCSS(elem[0], prop, true), 10 ) || 0;
+}
\ No newline at end of file