git.asbjorn.biz
/
jquery.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0a6c520
)
Fix for incorrect options being selected (noticed same problem with radio/checkbox...
author
John Resig
<jeresig@gmail.com>
Thu, 23 Jul 2009 22:16:29 +0000
(22:16 +0000)
committer
John Resig
<jeresig@gmail.com>
Thu, 23 Jul 2009 22:16:29 +0000
(22:16 +0000)
src/attributes.js
patch
|
blob
|
history
diff --git
a/src/attributes.js
b/src/attributes.js
index
de1d331
..
93e0433
100644
(file)
--- 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 ) )
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(){
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 )
});
if ( !values.length )