diff options
| author | Michał Gołębiowski <m.goleb@gmail.com> | 2015-07-20 19:24:46 +0200 |
|---|---|---|
| committer | Michał Gołębiowski <m.goleb@gmail.com> | 2015-09-14 21:26:48 +0200 |
| commit | ce3b4a62427c5a3a6669dcb8bf8e27a6287990d5 (patch) | |
| tree | 2b50ed87d23df888f5fcc299d7108b23bdbc3e56 /src/attributes | |
| parent | 64fd7ef3d081b5c65d541237f73a4d89f0f0ad7b (diff) | |
| download | jquery-ce3b4a62427c5a3a6669dcb8bf8e27a6287990d5.tar.gz jquery-ce3b4a62427c5a3a6669dcb8bf8e27a6287990d5.zip | |
Ajax:Attributes:CSS:Manipulation: Reduce Android 2.3 support
Drop non-critical workarounds for Android 2.3.
Fixes gh-2483
Fixes gh-2505
Closes gh-2581
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" ) ) ) { |