diff options
| author | timmywil <tim.willison@thisismedium.com> | 2011-04-21 21:33:09 -0400 |
|---|---|---|
| committer | jeresig <jeresig@gmail.com> | 2011-04-21 21:33:09 -0400 |
| commit | 3ac9eb7ce37b461a34e303e8b77aa544d313441c (patch) | |
| tree | 50cf69cf2e5d6c4e670ecd4757e0f12e48b010b8 | |
| parent | dbe966aa57ce10d6c93db46eb2f3369a39e10d01 (diff) | |
| download | jquery-3ac9eb7ce37b461a34e303e8b77aa544d313441c.tar.gz jquery-3ac9eb7ce37b461a34e303e8b77aa544d313441c.zip | |
Landing pull request [337](https://github.com/jquery/jquery/pull/337). Value of radio inputs resets when type is set after the value in all IEs. Fixes #8570 ([bug](http://bugs.jquery.com/ticket/8570)).
| -rw-r--r-- | src/attributes.js | 10 | ||||
| -rw-r--r-- | src/support.js | 5 | ||||
| -rw-r--r-- | test/unit/attributes.js | 8 |
3 files changed, 20 insertions, 3 deletions
diff --git a/src/attributes.js b/src/attributes.js index ac832591a..a296ad112 100644 --- a/src/attributes.js +++ b/src/attributes.js @@ -360,6 +360,15 @@ jQuery.extend({ // We can't allow the type property to be changed (since it causes problems in IE) if ( rtype.test( elem.nodeName ) && elem.parentNode ) { jQuery.error( "type property can't be changed" ); + } else if ( !jQuery.support.radioValue && value === "radio" && jQuery.nodeName(elem, "input") ) { + // Setting the type on a radio button after the value resets the value in IE6-9 + // Reset value to it's default in case type is set after value + var val = elem.getAttribute("value"); + elem.setAttribute( "type", value ); + if ( val ) { + elem.value = val; + } + return value; } } }, @@ -432,7 +441,6 @@ if ( !jQuery.support.getSetAttribute ) { }); // Use this for any attribute on a form in IE6/7 - // And the name attribute formHook = jQuery.attrHooks.name = jQuery.attrHooks.value = jQuery.valHooks.button = { get: function( elem, name ) { if ( name === "value" && !jQuery.nodeName( elem, "button" ) ) { diff --git a/src/support.js b/src/support.js index 867e18367..b286907ff 100644 --- a/src/support.js +++ b/src/support.js @@ -115,6 +115,11 @@ jQuery.support = (function() { div.cloneNode( true ).fireEvent( "onclick" ); } + input = document.createElement("input"); + input.value = "t"; + input.setAttribute("type", "radio"); + support.radioValue = input.value === "t"; + div.innerHTML = "<input type='radio' name='radiotest' checked='checked'/>"; fragment = document.createDocumentFragment(); diff --git a/test/unit/attributes.js b/test/unit/attributes.js index f663e443e..0889bf339 100644 --- a/test/unit/attributes.js +++ b/test/unit/attributes.js @@ -177,7 +177,7 @@ test("attr(Hash)", function() { }); test("attr(String, Object)", function() { - expect(29); + expect(30); var div = jQuery("div").attr("foo", "bar"), fail = false; @@ -290,7 +290,10 @@ test("attr(String, Object)", function() { } ok( thrown, "Exception thrown when trying to change type property" ); equals( "button", button.attr("type"), "Verify that you can't change the type of a button element" ); - + + var $radio = jQuery("<input>", { "value": "sup", "type": "radio" }).appendTo("#testForm"); + equals( $radio.val(), "sup", "Value is not reset when type is set after value on a radio" ); + // Setting attributes on svg elements (bug #3116) var $svg = jQuery("<svg xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' version='1.1' baseProfile='full' width='200' height='200'>" + "<circle cx='200' cy='200' r='150' />" @@ -557,6 +560,7 @@ test( "val(Array of Numbers) (Bug #7123)", function() { test("val(Function) with incoming value", function() { expect(10); + QUnit.reset(); var oldVal = jQuery("#text1").val(); jQuery("#text1").val(function(i, val) { |