Make a feature detect for the attribute selected code. Fixes #5702.

[jquery.git] / src / attributes.js

diff --git a/src/attributes.js b/src/attributes.js
index 4f5692f..a2108fe 100644 (file)
--- a/src/attributes.js
+++ b/src/attributes.js
@@ -4,7 +4,8 @@ var rclass = /[\n\t]/g,
        rspecialurl = /href|src|style/,
        rtype = /(button|input)/i,
        rfocusable = /(button|input|object|select|textarea)/i,
-       rclickable = /^(a|area)$/i;
+       rclickable = /^(a|area)$/i,
+       rradiocheck = /radio|checkbox/;
 
 jQuery.fn.extend({
        attr: function( name, value ) {
@@ -127,6 +128,12 @@ jQuery.fn.extend({
                                        return values;
                                }
 
+                               // Handle the case where in Webkit "" is returned instead of "on" if a value isn't specified
+                               if ( rradiocheck.test( elem.type ) && !jQuery.support.checkOn ) {
+                                       return elem.getAttribute("value") === null ? "on" : elem.value;
+                               }
+                               
+
                                // Everything else, we just grab the value
                                return (elem.value || "").replace(rreturn, "");
 
@@ -137,7 +144,7 @@ jQuery.fn.extend({
 
                // Typecast once if the value is a number
                if ( typeof value === "number" ) {
-                       value += '';
+                       value += "";
                }
 
                var val = value;
@@ -149,7 +156,7 @@ jQuery.fn.extend({
                                // Typecast each time if the value is a Function and the appended
                                // value is therefore different each time.
                                if ( typeof val === "number" ) {
-                                       val += '';
+                                       val += "";
                                }
                        }
 
@@ -157,14 +164,14 @@ jQuery.fn.extend({
                                return;
                        }
 
-                       if ( jQuery.isArray(val) && /radio|checkbox/.test( this.type ) ) {
-                               this.checked = jQuery.inArray(this.value || this.name, val) >= 0;
+                       if ( jQuery.isArray(val) && rradiocheck.test( this.type ) ) {
+                               this.checked = jQuery.inArray( jQuery(this).val(), val ) >= 0;
 
                        } else if ( jQuery.nodeName( this, "select" ) ) {
                                var values = jQuery.makeArray(val);
 
                                jQuery( "option", this ).each(function() {
-                                       this.selected = jQuery.inArray( this.value || this.text, values ) >= 0;
+                                       this.selected = jQuery.inArray( jQuery(this).val(), values ) >= 0;
                                });
 
                                if ( !values.length ) {
@@ -256,10 +263,18 @@ jQuery.extend({
                        // These attributes require special treatment
                        var special = rspecialurl.test( name );
 
-                       // 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
-                       if ( name === "selected" && elem.parentNode ) {
-                               elem.parentNode.selectedIndex;
+                       if ( name === "selected" && !jQuery.support.optSelected ) {
+                               var parent = elem.parentNode;
+                               if ( 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