deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Add a feature test for options inside a disabled select. Follow-up to 157a383dae.

Browse source
This commit is contained in:
jeresig 2010-09-27 10:19:55 -04:00
parent a384d840d6
commit 97d468fbf0
2 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/attributes.js
View file

@ -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();