X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fjquery%2Fjquery.js;h=1d2e197970b002b31219ac29ca4066dc4913e1b6;hb=8c15e852a4614ba5a5100e1c6e8a833c39b4ca79;hp=797280e073759b663dbc38da8c92405199063f5e;hpb=bd78d4f65dea2fc5fbfd58a0f099f8839ee9707d;p=jquery.git

diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js
index 797280e..1d2e197 100644
--- a/src/jquery/jquery.js
+++ b/src/jquery/jquery.js
@@ -1256,7 +1256,13 @@ jQuery.fn = jQuery.prototype = {
  */
 jQuery.extend = jQuery.fn.extend = function() {
 	// copy reference to target object
-	var target = arguments[0] || {}, a = 1, al = arguments.length;
+	var target = arguments[0] || {}, a = 1, al = arguments.length, deep = false;
+
+	// Handle a deep copy situation
+	if ( target.constructor == Boolean ) {
+		deep = target;
+		target = arguments[1] || {};
+	}
 
 	// extend jQuery itself if only one argument is passed
 	if ( al == 1 ) {
@@ -1276,7 +1282,7 @@ jQuery.extend = jQuery.fn.extend = function() {
 					continue;
 
 				// Recurse if we're merging object values
-				if ( typeof prop[i] == 'object' && target[i] )
+				if ( deep && typeof prop[i] == 'object' && target[i] )
 					jQuery.extend( target[i], prop[i] );
 
 				// Don't bring in undefined values