X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fattributes.js;h=fec132340c79814ad5e939e577da0666b9835c38;hb=3e0cc815043c2425819743e907a0ce263a7ce164;hp=b0e3601f5b00aa311f0ff956a82848ef29e3ef95;hpb=d4a9d45527ac8861f50ae3777d1bb3e33dacbea2;p=jquery.git

diff --git a/src/attributes.js b/src/attributes.js
index b0e3601..fec1323 100644
--- a/src/attributes.js
+++ b/src/attributes.js
@@ -182,7 +182,7 @@ jQuery.fn.extend({
 						var option = options[ i ];
 
 						// Don't return options that are disabled or in a disabled optgroup
-						if ( option.selected && (jQuery.support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null) && 
+						if ( option.selected && (jQuery.support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null) &&
 								(!option.parentNode.disabled || !jQuery.nodeName( option.parentNode, "optgroup" )) ) {
 
 							// Get the specific value for the option
@@ -272,8 +272,8 @@ jQuery.extend({
 	},
 
 	attr: function( elem, name, value, pass ) {
-		// don't set attributes on text and comment nodes
-		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 ) {
+		// don't get/set attributes on text, comment and attribute nodes
+		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || elem.nodeType === 2 ) {
 			return undefined;
 		}