From: John Resig <jeresig@gmail.com>
Date: Thu, 23 Jul 2009 22:16:29 +0000 (+0000)
Subject: Fix for incorrect options being selected (noticed same problem with radio/checkbox... 
X-Git-Url: http://git.asbjorn.it/?a=commitdiff_plain;h=9c9dd7cedea56a350d49ddcdf0982be9fcb6bad2;p=jquery.git

Fix for incorrect options being selected (noticed same problem with radio/checkbox and fixed it there, as well). Fixes #4962.
---

diff --git a/src/attributes.js b/src/attributes.js
index de1d331..93e0433 100644
--- 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 )