X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fjquery%2Fjquery.js;h=d04aa6199a0ec381b72f8420f78d556566db60ac;hb=74a8e206231162b005d95b667343678f786ae272;hp=a8872dfb8e17236f951e6f318809a246beb92f47;hpb=ec2b688920cf38f5bb2487b8a1897f7eb7557248;p=jquery.git

diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js
index a8872df..d04aa61 100644
--- a/src/jquery/jquery.js
+++ b/src/jquery/jquery.js
@@ -840,7 +840,7 @@ jQuery.fn = jQuery.prototype = {
 	 */
 	clone: function(deep) {
 		return this.pushStack( jQuery.map( this, function(a){
-			var a = a.cloneNode( deep != undefined ? deep : true );
+			a = a.cloneNode( deep != undefined ? deep : true );
 			a.$events = null; // drop $events expando to avoid firing incorrect events
 			return a;
 		}) );
@@ -1199,8 +1199,7 @@ jQuery.fn = jQuery.prototype = {
  */
 jQuery.extend = jQuery.fn.extend = function() {
 	// copy reference to target object
-	var target = arguments[0],
-		a = 1;
+	var target = arguments[0], a = 1;
 
 	// extend jQuery itself if only one argument is passed
 	if ( arguments.length == 1 ) {
@@ -1208,7 +1207,7 @@ jQuery.extend = jQuery.fn.extend = function() {
 		a = 0;
 	}
 	var prop;
-	while (prop = arguments[a++])
+	while ( (prop = arguments[a++]) != null )
 		// Extend the base object
 		for ( var i in prop ) target[i] = prop[i];
 
@@ -1345,10 +1344,7 @@ jQuery.extend({
 
 		// internal only, use is(".class")
 		has: function( t, c ) {
-			t = t.className || t;
-			// escape regex characters
-			c = c.replace(/([\.\\\+\*\?\[\^\]\$\(\)\{\}\=\!\<\>\|\:])/g, "\\$1");
-			return t && new RegExp("(^|\\s)" + c + "(\\s|$)").test( t );
+			return jQuery.inArray( c, (t.className || t).toString().split(/\s+/) ) > -1;
 		}
 	},
 
@@ -1376,7 +1372,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 {
@@ -1386,14 +1382,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);
@@ -1459,13 +1455,16 @@ jQuery.extend({
 			 // Convert html string into DOM nodes
 			if ( typeof arg == "string" ) {
 				// Trim whitespace, otherwise indexOf won't work as expected
-				var s = jQuery.trim(arg), div = doc.createElement("div"), tb = [];
+				var s = jQuery.trim(arg).toLowerCase(), div = doc.createElement("div"), tb = [];
 
 				var wrap =
 					 // option or optgroup
 					!s.indexOf("<opt") &&
 					[1, "<select>", "</select>"] ||
 					
+					!s.indexOf("<leg") &&
+					[1, "<fieldset>", "</fieldset>"] ||
+					
 					(!s.indexOf("<thead") || !s.indexOf("<tbody") || !s.indexOf("<tfoot")) &&
 					[1, "<table>", "</table>"] ||
 					
@@ -1505,10 +1504,10 @@ jQuery.extend({
 				arg = jQuery.makeArray( div.childNodes );
 			}
 
-			if ( arg.length === 0 && !jQuery.nodeName(arg, "form") )
+			if ( 0 === arg.length && !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 );
@@ -1629,9 +1628,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;
 	},
 
@@ -1639,7 +1639,7 @@ jQuery.extend({
 		var r = [], num = jQuery.mergeNum++;
 
 		for ( var i = 0, fl = first.length; i < fl; i++ )
-			if ( first[i].mergeNum != num ) {
+			if ( num != first[i].mergeNum ) {
 				first[i].mergeNum = num;
 				r.push(first[i]);
 			}
@@ -1783,6 +1783,7 @@ new function() {
 
 	// Figure out what browser is being used
 	jQuery.browser = {
+		version: b.match(/.+[xiae][\/ ]([\d.]+)/)[1],
 		safari: /webkit/.test(b),
 		opera: /opera/.test(b),
 		msie: /msie/.test(b) && !/opera/.test(b),