mirror of
https://github.com/jquery/jquery.git
synced 2024-11-23 02:54:22 +00:00
Fix for incorrect options being selected (noticed same problem with radio/checkbox and fixed it there, as well). Fixes #4962.
This commit is contained in:
parent
0a6c5205d2
commit
9c9dd7cede
@ -100,15 +100,13 @@ jQuery.fn.extend({
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
if ( jQuery.isArray(val) && /radio|checkbox/.test( this.type ) )
|
if ( jQuery.isArray(val) && /radio|checkbox/.test( this.type ) )
|
||||||
this.checked = (jQuery.inArray(this.value, val) >= 0 ||
|
this.checked = jQuery.inArray(this.value || this.name, val) >= 0;
|
||||||
jQuery.inArray(this.name, val) >= 0);
|
|
||||||
|
|
||||||
else if ( jQuery.nodeName( this, "select" ) ) {
|
else if ( jQuery.nodeName( this, "select" ) ) {
|
||||||
var values = jQuery.makeArray(val);
|
var values = jQuery.makeArray(val);
|
||||||
|
|
||||||
jQuery( "option", this ).each(function(){
|
jQuery( "option", this ).each(function(){
|
||||||
this.selected = (jQuery.inArray( this.value, values ) >= 0 ||
|
this.selected = jQuery.inArray( this.value || this.text, values ) >= 0;
|
||||||
jQuery.inArray( this.text, values ) >= 0);
|
|
||||||
});
|
});
|
||||||
|
|
||||||
if ( !values.length )
|
if ( !values.length )
|
||||||
|
Loading…
Reference in New Issue
Block a user