From f6302b0b53d61dfe1adbfaf6612be5cbced5bbc1 Mon Sep 17 00:00:00 2001 From: Michał Gołębiowski Date: Thu, 4 Dec 2014 14:43:35 +0100 Subject: 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 --- src/attributes/val.js | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'src/attributes/val.js') diff --git a/src/attributes/val.js b/src/attributes/val.js index f67afb156..c5e8c63f4 100644 --- a/src/attributes/val.js +++ b/src/attributes/val.js @@ -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; } } -- cgit v1.2.3