diff options
Diffstat (limited to 'src/attributes')
| -rw-r--r-- | src/attributes/support.js | 5 | ||||
| -rw-r--r-- | src/attributes/val.js | 3 |
2 files changed, 1 insertions, 7 deletions
diff --git a/src/attributes/support.js b/src/attributes/support.js index 13bcd4572..f93ba0181 100644 --- a/src/attributes/support.js +++ b/src/attributes/support.js @@ -18,11 +18,6 @@ define( [ // Must access selectedIndex to make default options select support.optSelected = opt.selected; - // Support: Android<=2.3 - // Options inside disabled selects are incorrectly marked as disabled - select.disabled = true; - support.optDisabled = !opt.disabled; - // Support: IE<=11+ // An input loses its value after becoming a radio input = document.createElement( "input" ); diff --git a/src/attributes/val.js b/src/attributes/val.js index 9999d985b..caf0126d4 100644 --- a/src/attributes/val.js +++ b/src/attributes/val.js @@ -105,8 +105,7 @@ jQuery.extend( { if ( ( option.selected || i === index ) && // Don't return options that are disabled or in a disabled optgroup - ( support.optDisabled ? - !option.disabled : option.getAttribute( "disabled" ) === null ) && + !option.disabled && ( !option.parentNode.disabled || !jQuery.nodeName( option.parentNode, "optgroup" ) ) ) { |