X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fattributes.js;h=794da70ff6fda97e1910a53565bde8cd7ec20cbf;hb=1e64d581830f735999b60939eccf9bcdcb2e9ef9;hp=663d660f4245433ac4d69606e15b3e600ff63730;hpb=1b67aaee74c9b683ac31893b40077abd62e6d8c6;p=jquery.git diff --git a/src/attributes.js b/src/attributes.js index 663d660..794da70 100644 --- 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, ""); @@ -157,8 +164,8 @@ jQuery.fn.extend({ return; } - if ( jQuery.isArray(val) && /radio|checkbox/.test( this.type ) ) { - this.checked = jQuery.inArray( this.value, 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);