deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Make .attr(name, null) equivalent to removeAttr(name). (Was roughly this before - but is now consistent across platforms). Fixes #6341.

Browse source
This commit is contained in:
John Resig 2010-09-28 11:12:13 -04:00
parent cf672a2e7a
commit c7c0677230
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/attributes.js
View file

@ -295,7 +295,14 @@ jQuery.extend({
jQuery.error( "type property can't be changed" ); jQuery.error( "type property can't be changed" );
} }
elem[ name ] = value; if ( value === null ) {
if ( elem.nodeType === 1 ) {
elem.removeAttribute( name );
}
} else {
elem[ name ] = value;
}
} }
// browsers index elements by id/name on forms, give priority to attributes. // browsers index elements by id/name on forms, give priority to attributes.

7
test/unit/attributes.js
View file

@ -98,15 +98,18 @@ test("attr(Hash)", function() {
}); });
test("attr(String, Object)", function() { test("attr(String, Object)", function() {
expect(23); expect(24);
var div = jQuery("div").attr("foo", "bar"), var div = jQuery("div").attr("foo", "bar"),
fail = false; fail = false;
for ( var i = 0; i < div.size(); i++ ) { for ( var i = 0; i < div.size(); i++ ) {
if ( div.get(i).getAttribute('foo') != "bar" ){ if ( div.get(i).getAttribute('foo') != "bar" ){
fail = i; fail = i;
break; break;
} }
} }
equals( fail, false, "Set Attribute, the #"+fail+" element didn't get the attribute 'foo'" ); equals( fail, false, "Set Attribute, the #"+fail+" element didn't get the attribute 'foo'" );
// Fails on IE since recent changes to .attr() // Fails on IE since recent changes to .attr()
@ -114,6 +117,8 @@ test("attr(String, Object)", function() {
jQuery("#name").attr('name', 'something'); jQuery("#name").attr('name', 'something');
equals( jQuery("#name").attr('name'), 'something', 'Set name attribute' ); equals( jQuery("#name").attr('name'), 'something', 'Set name attribute' );
jQuery("#name").attr('name', null);
equals( jQuery("#name").attr('title'), '', 'Remove name attribute' );
jQuery("#check2").attr('checked', true); jQuery("#check2").attr('checked', true);
equals( document.getElementById('check2').checked, true, 'Set checked attribute' ); equals( document.getElementById('check2').checked, true, 'Set checked attribute' );
jQuery("#check2").attr('checked', false); jQuery("#check2").attr('checked', false);