Make sure that the correct value is being pulled from checkboxes in Webkit. Fixes...

[jquery.git] / src / attributes.js

diff --git a/src/attributes.js b/src/attributes.js
index e7e5d37..794da70 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,19 +144,19 @@ jQuery.fn.extend({
 
                // Typecast once if the value is a number
                if ( typeof value === "number" ) {
-                       value += '';
+                       value += "";
                }
 
                var val = value;
 
-               return this.each(function(){
+               return this.each(function() {
                        if ( jQuery.isFunction(value) ) {
                                val = value.call(this);
 
                                // 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,16 @@ 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;
+                               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;
                                });
 
                                if ( !values.length ) {
@@ -210,10 +219,12 @@ jQuery.each({
                        this.className = this.className || classNames === false ? "" : jQuery.data( this, "__className__" ) || "";
                }
        }
-}, function(name, fn){
-       jQuery.fn[ name ] = function(val, state){
+}, function( name, fn ) {
+       jQuery.fn[ name ] = function( val, state ) {
                if ( jQuery.isFunction( val ) ) {
-                       return this.each(function() { jQuery(this)[ name ]( val.call(this), state ); });
+                       return this.each(function() {
+                               jQuery(this)[ name ]( val.call(this), state );
+                       });
                }
 
                return this.each( fn, arguments );