Skip to content
Permalink
Browse files

Fix #13514: Set selectedIndex to -1 when non-matching value is set on…

… a select. Close gh-1191.

(cherry picked from commit 48d71d0)
  • Loading branch information
ruado1987 authored and gibson042 committed Mar 3, 2013
1 parent 8f45724 commit c9ca9bf509edd1dc0a92564210f3f325cc7555b6
Showing with 30 additions and 7 deletions.
  1. +14 −7 src/attributes.js
  2. +16 −0 test/unit/attributes.js
@@ -272,13 +272,20 @@ jQuery.extend({
},

set: function( elem, value ) {
var values = jQuery.makeArray( value );

jQuery(elem).find("option").each(function() {
this.selected = jQuery.inArray( jQuery(this).val(), values ) >= 0;
});

if ( !values.length ) {
var optionSet, option,
options = elem.options,
values = jQuery.makeArray( value ),
i = options.length;

while ( i-- ) {
option = options[ i ];
if ( (option.selected = jQuery.inArray( jQuery(option).val(), values ) >= 0) ) {
optionSet = true;
}
}

// force browsers to behave consistently when non-matching value is set
if ( !optionSet ) {
elem.selectedIndex = -1;
}
return values;
@@ -846,6 +846,22 @@ test( "val()", function() {
equal( jQuery("<option/>").val("test").attr("value"), "test", "Setting value sets the value attribute" );
});

test("val() with non-matching values on dropdown list", function() {
expect( 3 );

jQuery("#select5").val( "" );
equal( jQuery("#select5").val(), null, "Non-matching set on select-one" );

var select6 = jQuery("<select multiple id=\"select6\"><option value=\"1\">A</option><option value=\"2\">B</option></select>").appendTo("#form");
jQuery(select6).val( "nothing" );
equal( jQuery(select6).val(), null, "Non-matching set (single value) on select-multiple" );

jQuery(select6).val( ["nothing1", "nothing2"] );
equal( jQuery(select6).val(), null, "Non-matching set (array of values) on select-multiple" );

select6.remove();
});

if ( "value" in document.createElement("meter") &&
"value" in document.createElement("progress") ) {

0 comments on commit c9ca9bf

Please sign in to comment.
You can’t perform that action at this time.