Commit 9c9dd7ce authored by John Resig's avatar John Resig

Fix for incorrect options being selected (noticed same problem with...

Fix for incorrect options being selected (noticed same problem with radio/checkbox and fixed it there, as well). Fixes #4962.
parent 0a6c5205
...@@ -100,15 +100,13 @@ jQuery.fn.extend({ ...@@ -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 )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment