X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fattributes.js;fp=src%2Fattributes.js;h=dd6a3e7abe641b387aaa0077bdc30387373acb7d;hb=97d468fbf0f840f52c91855b0bc8db0ed6ac403c;hp=1afcf2a8dbbedfc453c9b3bde8b57dcc428a8ffa;hpb=a384d840d609a8ee25b8ca8769a99c33c73b022f;p=jquery.git

diff --git a/src/attributes.js b/src/attributes.js
index 1afcf2a..dd6a3e7 100644
--- a/src/attributes.js
+++ b/src/attributes.js
@@ -164,8 +164,9 @@ jQuery.fn.extend({
 						var option = options[ i ];
 
 						// Don't return options that are disabled or in a disabled optgroup
-						if ( option.selected && 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
 							value = jQuery(option).val();