git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
The option isn't, necessarily, hidden when this occurs.
[jquery.git]
/
src
/
attributes.js
diff --git
a/src/attributes.js
b/src/attributes.js
index
794da70
..
b3a49f5
100644
(file)
--- a/
src/attributes.js
+++ b/
src/attributes.js
@@
-171,9
+171,7
@@
jQuery.fn.extend({
var values = jQuery.makeArray(val);
jQuery( "option", this ).each(function() {
var values = jQuery.makeArray(val);
jQuery( "option", this ).each(function() {
- // IE 6 will return "" for the value if one isn't specified, instead of the text
- var node = this.getAttributeNode("value");
- this.selected = jQuery.inArray( node && node.specified ? node.value : this.value || this.text, values ) >= 0;
+ this.selected = jQuery.inArray( jQuery(this).val(), values ) >= 0;
});
if ( !values.length ) {
});
if ( !values.length ) {
@@
-263,12
+261,17
@@
jQuery.extend({
// Only do all the following if this is a node (faster for style)
if ( elem.nodeType === 1 ) {
// These attributes require special treatment
// Only do all the following if this is a node (faster for style)
if ( elem.nodeType === 1 ) {
// These attributes require special treatment
- var special = rspecialurl.test( name );
+ var special = rspecialurl.test( name ), parent = elem.parentNode;
- // Safari mis-reports the default selected property of a hidden option
+ // Safari mis-reports the default selected property of an option
// Accessing the parent's selectedIndex property fixes it
// Accessing the parent's selectedIndex property fixes it
- if ( name === "selected" && elem.parentNode ) {
- elem.parentNode.selectedIndex;
+ if ( name === "selected" && parent ) {
+ parent.selectedIndex;
+
+ // Make sure that it also works with optgroups, see #5701
+ if ( parent.parentNode ) {
+ parent.parentNode.selectedIndex;
+ }
}
// If applicable, access the attribute via the DOM 0 way
}
// If applicable, access the attribute via the DOM 0 way