Fix for incorrect options being selected (noticed same problem with r…

…adio/checkbox and fixed it there, as well). Fixes #4962.
jquery · Jul 23, 2009 · 9c9dd7c · 9c9dd7c
1 parent 0a6c520
commit 9c9dd7c
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/src/attributes.js b/src/attributes.js
@@ -100,15 +100,13 @@ jQuery.fn.extend({
 				return;
 
 			if ( jQuery.isArray(val) && /radio|checkbox/.test( this.type ) )
-				this.checked = (jQuery.inArray(this.value, val) >= 0 ||
-					jQuery.inArray(this.name, val) >= 0);
+				this.checked = jQuery.inArray(this.value || this.name, val) >= 0;
 
 			else if ( jQuery.nodeName( this, "select" ) ) {
 				var values = jQuery.makeArray(val);
 
 				jQuery( "option", this ).each(function(){
-					this.selected = (jQuery.inArray( this.value, values ) >= 0 ||
-						jQuery.inArray( this.text, values ) >= 0);
+					this.selected = jQuery.inArray( this.value || this.text, values ) >= 0;
 				});
 
 				if ( !values.length )