X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fcore.js;h=5e1f0b051b9c5ce1e2ab30279c3ed8d2de2201c4;hb=6bf51eea0489149c755f12007b585dc5521b46d3;hp=d46f89d16a00c087accbeff5885787fbd9670af0;hpb=7f27816d3068bff70eecfcf18366b54345750efe;p=jquery.git

diff --git a/src/core.js b/src/core.js
index d46f89d..5e1f0b0 100644
--- a/src/core.js
+++ b/src/core.js
@@ -1060,7 +1060,7 @@ jQuery.extend({
 				elem.parentNode.selectedIndex;
 
 			// If applicable, access the attribute via the DOM 0 way
-			if ( notxml && !special && name in elem ) {
+			if ( name in elem && notxml && !special ) {
 				if ( set ){
 					// We can't allow the type property to be changed (since it causes problems in IE)
 					if ( name == "type" && jQuery.nodeName( elem, "input" ) && elem.parentNode )
@@ -1083,11 +1083,13 @@ jQuery.extend({
 				// convert the value to a string (all browsers do this but IE) see #1070
 				elem.setAttribute( name, "" + value );
 
-			if ( msie && special && notxml )
-				return elem.getAttribute( name, 2 );
-
-			return elem.getAttribute( name );
+			var attr = msie && notxml && special
+					// Some attributes require a special call on IE
+					? elem.getAttribute( name, 2 )
+					: elem.getAttribute( name );
 
+			// Non-existent attributes return null, we normalize to undefined
+			return attr === null ? undefined : attr;
 		}
 
 		// elem is actually elem.style ... set the style
@@ -1242,7 +1244,8 @@ jQuery.extend({
 		styleFloat: styleFloat,
 		readonly: "readOnly",
 		maxlength: "maxLength",
-		cellspacing: "cellSpacing"
+		cellspacing: "cellSpacing",
+		rowspan: "rowSpan"
 	}
 });