aboutsummaryrefslogtreecommitdiffstats
path: root/src/attributes.js
diff options
context:
space:
mode:
authorjeresig <jeresig@gmail.com>2010-09-27 10:19:55 -0400
committerjeresig <jeresig@gmail.com>2010-09-27 10:19:55 -0400
commit97d468fbf0f840f52c91855b0bc8db0ed6ac403c (patch)
treeca9ac63622f86efd9e40be8d4117c4e86b77fd73 /src/attributes.js
parenta384d840d609a8ee25b8ca8769a99c33c73b022f (diff)
downloadjquery-97d468fbf0f840f52c91855b0bc8db0ed6ac403c.tar.gz
jquery-97d468fbf0f840f52c91855b0bc8db0ed6ac403c.zip
Add a feature test for options inside a disabled select. Follow-up to 157a383dae5335ef1056d3818d7dd70ac81c25a7.
Diffstat (limited to 'src/attributes.js')
-rw-r--r--src/attributes.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/attributes.js b/src/attributes.js
index 1afcf2a8d..dd6a3e7ab 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();