X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fjquery%2Fjquery.js;h=1c701933a66719b1db4042c72c2b02b58ed5a638;hb=b15ae79a389299cac19f59ed14efafc3e9d8ef0d;hp=e2a2a22c09ba0a4820487522d78c1803d3662833;hpb=d4849a0d3589ea3d369137f79b102eb68403b489;p=jquery.git

diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js
index e2a2a22..1c70193 100644
--- a/src/jquery/jquery.js
+++ b/src/jquery/jquery.js
@@ -824,7 +824,9 @@ jQuery.fn = jQuery.prototype = {
 	 */
 	clone: function(deep) {
 		return this.pushStack( jQuery.map( this, function(a){
-			return a.cloneNode( deep != undefined ? deep : true );
+			var a = a.cloneNode( deep != undefined ? deep : true );
+			a.$events = null; // drop $events expando to avoid firing incorrect events
+			return a;
 		}) );
 	},
 
@@ -1225,9 +1227,14 @@ jQuery.extend({
 	// This may seem like some crazy code, but trust me when I say that this
 	// is the only cross-browser way to do this. --John
 	isFunction: function( fn ) {
-		return !!fn && typeof fn != "string" &&
+		return !!fn && typeof fn != "string" && !fn.nodeName && 
 			typeof fn[0] == "undefined" && /function/i.test( fn + "" );
 	},
+	
+	// check if an element is in a XML document
+	isXMLDoc: function(elem) {
+		return elem.tagName && elem.ownerDocument && !elem.ownerDocument.body;
+	},
 
 	nodeName: function( elem, name ) {
 		return elem.nodeName && elem.nodeName.toUpperCase() == name.toUpperCase();
@@ -1275,16 +1282,15 @@ jQuery.extend({
 	prop: function(elem, value, type, index, prop){
 			// Handle executable functions
 			if ( jQuery.isFunction( value ) )
-				return value.call( elem, [index] );
+				value = value.call( elem, [index] );
 				
 			// exclude the following css properties to add px
 			var exclude = /z-?index|font-?weight|opacity|zoom|line-?height/i;
 
 			// Handle passing in a number to a CSS property
-			if ( value && value.constructor == Number && type == "curCSS" && !exclude.test(prop) )
-				return value + "px";
-
-			return value;
+			return value && value.constructor == Number && type == "curCSS" && !exclude.test(prop) ?
+				value + "px" :
+				value;
 	},
 
 	className: {
@@ -1307,6 +1313,8 @@ 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 );
 		}
 	},
@@ -1463,10 +1471,10 @@ jQuery.extend({
 				arg = div.childNodes;
 			}
 
-			if ( arg.length === 0 )
+			if ( arg.length === 0 && !jQuery.nodeName(arg, "form") )
 				return;
 			
-			if ( arg[0] == undefined )
+			if ( arg[0] == undefined || jQuery.nodeName(arg, "form") )
 				r.push( arg );
 			else
 				r = jQuery.merge( r, arg );
@@ -1477,7 +1485,7 @@ jQuery.extend({
 	},
 	
 	attr: function(elem, name, value){
-		var fix = {
+		var fix = jQuery.isXMLDoc(elem) ? {} : {
 			"for": "htmlFor",
 			"class": "className",
 			"float": jQuery.browser.msie ? "styleFloat" : "cssFloat",
@@ -1508,6 +1516,7 @@ jQuery.extend({
 		// Mozilla doesn't play well with opacity 1
 		if ( name == "opacity" && jQuery.browser.mozilla && value == 1 )
 			value = 0.9999;
+			
 
 		// Certain attributes only work when accessed via the old DOM 0 way
 		if ( fix[name] ) {
@@ -1520,8 +1529,11 @@ jQuery.extend({
 		// IE elem.getAttribute passes even for style
 		else if ( elem.tagName ) {
 			if ( value != undefined ) elem.setAttribute( name, value );
+			if ( jQuery.browser.msie && /href|src/.test(name) && !jQuery.isXMLDoc(elem) ) 
+				return elem.getAttribute( name, 2 );
 			return elem.getAttribute( name );
 
+		// elem is actually elem.style ... set the style
 		} else {
 			name = name.replace(/-([a-z])/ig,function(z,b){return b.toUpperCase();});
 			if ( value != undefined ) elem[name] = value;