diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/attributes.js | 13 | ||||
| -rw-r--r-- | src/support.js | 7 |
2 files changed, 16 insertions, 4 deletions
diff --git a/src/attributes.js b/src/attributes.js index 663d660f4..794da70ff 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); diff --git a/src/support.js b/src/support.js index 71cf9db8e..976729828 100644 --- a/src/support.js +++ b/src/support.js @@ -8,7 +8,7 @@ id = "script" + now(); div.style.display = "none"; - div.innerHTML = " <link/><table></table><a href='/a' style='color:red;float:left;opacity:.55;'>a</a><select><option>text</option></select>"; + div.innerHTML = " <link/><table></table><a href='/a' style='color:red;float:left;opacity:.55;'>a</a><select><option>text</option></select><input type='checkbox'/>"; var all = div.getElementsByTagName("*"), a = div.getElementsByTagName("a")[0]; @@ -47,6 +47,11 @@ // (IE uses styleFloat instead of cssFloat) cssFloat: !!a.style.cssFloat, + // Make sure that if no value is specified for a checkbox + // that it defaults to "on". + // (WebKit defaults to "" instead) + checkOn: div.getElementsByTagName("input")[0].value === "on", + // Will be defined later scriptEval: false, noCloneEvent: true, |