Permalink
Browse files

Attributes: Use the option val hook in select val hook and simplify it

The hook is still defined; not using it could cause issues in IE<11.
Also, IE10 no longer throws when value not set but it still doesn't trim the
value. IE11 has all those issues fixed; support comments are updated.

Fixes gh-1902
Closes gh-1901
  • Loading branch information...
mgol committed Dec 4, 2014
1 parent dd596cc commit f6302b0b53d61dfe1adbfaf6612be5cbced5bbc1
Showing with 10 additions and 7 deletions.
  1. +5 −7 src/attributes/val.js
  2. +5 −0 test/unit/attributes.js
View
@@ -74,12 +74,9 @@ jQuery.extend({
valHooks: {
option: {
get: function( elem ) {
- var val = jQuery.find.attr( elem, "value" );
- return val != null ?
- val :
- // Support: IE10-11+
- // option.text throws exceptions (#14686, #14858)
- jQuery.trim( jQuery.text( elem ) );
+ // Support: IE<11
+ // option.value not trimmed (#14858)
+ return jQuery.trim( elem.value );
}
},
select: {
@@ -130,7 +127,8 @@ jQuery.extend({
while ( i-- ) {
option = options[ i ];
- if ( (option.selected = jQuery.inArray( option.value, values ) >= 0) ) {
+ if ( (option.selected =
+ jQuery.inArray( jQuery.valHooks.option.get( option ), values ) >= 0) ) {
optionSet = true;
}
}
View
@@ -1461,6 +1461,11 @@ test( "should not throw at $(option).val() (#14686)", 1, function() {
}
});
+test( "option value not trimmed when setting via parent select", function() {
+ expect( 1 );
+ equal( jQuery( "<select><option> 2</option></select>" ).val( "2" ).val(), "2" );
+});
+
test( "Insignificant white space returned for $(option).val() (#14858)", function() {
expect ( 3 );

0 comments on commit f6302b0

Please sign in to comment.