diff options
| author | John Resig <jeresig@gmail.com> | 2009-07-23 22:16:29 +0000 |
|---|---|---|
| committer | John Resig <jeresig@gmail.com> | 2009-07-23 22:16:29 +0000 |
| commit | 9c9dd7cedea56a350d49ddcdf0982be9fcb6bad2 (patch) | |
| tree | fd7f3c782294f173b7f3dec916454b44c0ef349c /src/attributes.js | |
| parent | 0a6c5205d21c29485ff8338881825135b6d9f373 (diff) | |
| download | jquery-9c9dd7cedea56a350d49ddcdf0982be9fcb6bad2.tar.gz jquery-9c9dd7cedea56a350d49ddcdf0982be9fcb6bad2.zip | |
Fix for incorrect options being selected (noticed same problem with radio/checkbox and fixed it there, as well). Fixes #4962.
Diffstat (limited to 'src/attributes.js')
| -rw-r--r-- | src/attributes.js | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/attributes.js b/src/attributes.js index de1d331b0..93e043368 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 ) |