X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fjquery%2Fjquery.js;h=88598678995cafdd6de6c3ddce08b5dad2657717;hb=cb828f3dab6ec8439ac111246346a8d4b3205fed;hp=910c11b21a28c64aae2459b71e3805d9d8111afc;hpb=ae208246fbd1708b72e822b61c9e24d3034d1a05;p=jquery.git

diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js
index 910c11b..8859867 100644
--- a/src/jquery/jquery.js
+++ b/src/jquery/jquery.js
@@ -1177,6 +1177,10 @@ jQuery.fn = jQuery.prototype = {
 /**
  * Extend one object with one or more others, returning the original,
  * modified, object. This is a great utility for simple inheritance.
+ *
+ * There is also an optional collision resolution function. Any time the target and
+ * merged object both contain a key this function is called. This may be used to create
+ * a recursive merge. (See example) Unless you know what this is, you probably don't care.
  * 
  * @example var settings = { validate: false, limit: 5, name: "foo" };
  * var options = { validate: true, name: "bar" };
@@ -1190,8 +1194,19 @@ jQuery.fn = jQuery.prototype = {
  * @result settings == { validate: true, limit: 5, name: "bar" }
  * @desc Merge defaults and options, without modifying the defaults
  *
+ * @example var defaults = { validate: false, limit: 5, name: "foo", nested: {depth: false} };
+ * var options = { validate: true, name: "bar", nested: {depth: true} };
+ * var collision_resolver_fn = function(target, mergee) {
+ *   // combine nested Objects, in this case the object being merged takes priority
+ *   return jQuery.extend({}, target, mergee);
+ * }
+ * var settings = jQuery.extend({}, collision_resolver_fn, defaults, options);
+ * @result settings == { validate: true, limit: 5, name: "bar" }
+ * @desc Recursively merge defaults and options, without modifying the defaults
+ *
  * @name $.extend
  * @param Object target The object to extend
+ * @param Function (optional) collision resolution function. Hook to extend the merging behavior of $.extend(). See example.
  * @param Object prop1 The object that will be merged into the first.
  * @param Object propN (optional) More objects to merge into the first
  * @type Object
@@ -1199,18 +1214,26 @@ jQuery.fn = jQuery.prototype = {
  */
 jQuery.extend = jQuery.fn.extend = function() {
 	// copy reference to target object
-	var target = arguments[0],
+	var resolver, prop, target = arguments[0],
 		a = 1;
-
+	
 	// extend jQuery itself if only one argument is passed
 	if ( arguments.length == 1 ) {
 		target = this;
 		a = 0;
+	} else if (jQuery.isFunction(arguments[a])) {
+	  resolver = arguments[a++];
 	}
-	var prop;
+
 	while (prop = arguments[a++])
 		// Extend the base object
-		for ( var i in prop ) target[i] = prop[i];
+		for ( var i in prop ) {
+		  if (resolver && target[i] && prop[i]) {
+		    target[i] = resolver(target[i], prop[i]);
+	    } else {
+		    target[i] = prop[i];
+		  }
+	  }
 
 	// Return the modified object
 	return target;
@@ -1373,7 +1396,7 @@ jQuery.extend({
 			});
 
 			jQuery.swap( e, old, function() {
-				if (jQuery.css(e,"display") != "none") {
+				if ( jQuery(e).is(':visible') ) {
 					oHeight = e.offsetHeight;
 					oWidth = e.offsetWidth;
 				} else {
@@ -1383,14 +1406,14 @@ jQuery.extend({
 							visibility: "hidden", position: "absolute", display: "block", right: "0", left: "0"
 						}).appendTo(e.parentNode)[0];
 
-					var parPos = jQuery.css(e.parentNode,"position");
-					if ( parPos == "" || parPos == "static" )
+					var parPos = jQuery.css(e.parentNode,"position") || "static";
+					if ( parPos == "static" )
 						e.parentNode.style.position = "relative";
 
 					oHeight = e.clientHeight;
 					oWidth = e.clientWidth;
 
-					if ( parPos == "" || parPos == "static" )
+					if ( parPos == "static" )
 						e.parentNode.style.position = "static";
 
 					e.parentNode.removeChild(e);
@@ -1502,10 +1525,10 @@ jQuery.extend({
 				arg = jQuery.makeArray( div.childNodes );
 			}
 
-			if ( arg.length === 0 && !jQuery.nodeName(arg, "form") )
+			if ( arg.length === 0 && !jQuery(arg).is("form, select") )
 				return;
-			
-			if ( arg[0] == undefined || jQuery.nodeName(arg, "form") )
+
+			if ( arg[0] == undefined || jQuery(arg).is("form, select") )
 				r.push( arg );
 			else
 				r = jQuery.merge( r, arg );
@@ -1626,9 +1649,10 @@ jQuery.extend({
 	 * @cat JavaScript
 	 */
 	merge: function(first, second) {
-		for ( var i = 0, sl = second.length; i < sl; i++ )
+		// We have to loop this way because IE & Opera overwrite the length
+		// expando of getElementsByTagName
+		for ( var i = 0; second[i]; i++ )
 			first.push(second[i]);
-
 		return first;
 	},