Skip to content
Permalink
Browse files

Make sure attr() works on non DOM element nodes. Fixes #7202, #7451, …

…#7500.

Also added some tests for this attr(name), attr(name, value) and removeAttr(name).
  • Loading branch information...
jitter committed Nov 13, 2010
1 parent 49f088f commit b50f41a2e3ba9ab9a7bcf69a9633b0a8258015d6
Showing with 54 additions and 4 deletions.
  1. +6 −1 src/attributes.js
  2. +48 −3 test/unit/attributes.js
@@ -289,7 +289,7 @@ jQuery.extend({
name = notxml && jQuery.props[ name ] || name;

// Only do all the following if this is a node (faster for style)
if ( elem.nodeName ) {
if ( elem.nodeType === 1 ) {
// These attributes require special treatment
var special = rspecialurl.test( name );

@@ -373,6 +373,11 @@ jQuery.extend({
// Non-existent attributes return null, we normalize to undefined
return attr === null ? undefined : attr;
}
// Handle everything which isn't a DOM element node
if ( set ) {
elem[ name ] = value;
}
return elem[ name ];
}
});

@@ -4,7 +4,7 @@ var bareObj = function(value) { return value; };
var functionReturningObj = function(value) { return (function() { return value; }); };

test("attr(String)", function() {
expect(31);
expect(37);

// This one sometimes fails randomly ?!
equals( jQuery('#text1').attr('value'), "Test", 'Check for value attribute' );
@@ -67,6 +67,14 @@ test("attr(String)", function() {
ok( jQuery().attr("doesntexist") === undefined, "Make sure undefined is returned when no element is there." );

equals( jQuery(document).attr("nodeName"), "#document", "attr works correctly on document nodes (bug #7451)." );

var attributeNode = document.createAttribute("irrelevant"),
commentNode = document.createComment("some comment"),
textNode = document.createTextNode("some text"),
obj = {};
jQuery.each( [document, attributeNode, commentNode, textNode, obj, "#firstp"], function( i, ele ) {
strictEqual( jQuery(ele).attr("nonexisting"), undefined, "attr works correctly for non existing attributes (bug #7500)." );
});
});

if ( !isLocal ) {
@@ -100,7 +108,7 @@ test("attr(Hash)", function() {
});

test("attr(String, Object)", function() {
expect(24);
expect(30);

var div = jQuery("div").attr("foo", "bar"),
fail = false;
@@ -134,6 +142,25 @@ test("attr(String, Object)", function() {
jQuery("#name").attr('maxLength', '10');
equals( document.getElementById('name').maxLength, '10', 'Set maxlength attribute' );

var attributeNode = document.createAttribute("irrelevant"),
commentNode = document.createComment("some comment"),
textNode = document.createTextNode("some text"),
obj = {};
jQuery.each( [document, attributeNode, obj, "#firstp"], function( i, ele ) {
var $ele = jQuery( ele );
$ele.attr( "nonexisting", "foo" );
equal( $ele.attr("nonexisting"), "foo", "attr(name, value) works correctly for non existing attributes (bug #7500)." );
});
jQuery.each( [commentNode, textNode], function( i, ele ) {
var $ele = jQuery( ele );
$ele.attr( "nonexisting", "foo" );
strictEqual( $ele.attr("nonexisting"), undefined, "attr(name, value) works correctly on comment and text nodes (bug #7500)." );
});
//cleanup
jQuery.each( [document, "#firstp"], function( i, ele ) {
jQuery( ele ).removeAttr("nonexisting");
});

var table = jQuery('#table').append("<tr><td>cell</td></tr><tr><td>cell</td><td>cell</td></tr><tr><td>cell</td><td>cell</td></tr>"),
td = table.find('td:first');
td.attr("rowspan", "2");
@@ -304,8 +331,26 @@ test("attr('tabindex', value)", function() {
});

test("removeAttr(String)", function() {
expect(1);
expect(7);
equals( jQuery('#mark').removeAttr( "class" )[0].className, "", "remove class" );

var attributeNode = document.createAttribute("irrelevant"),
commentNode = document.createComment("some comment"),
textNode = document.createTextNode("some text"),
obj = {};
//removeAttr only really removes on DOM element nodes handle all other seperatyl
strictEqual( jQuery( "#firstp" ).attr( "nonexisting", "foo" ).removeAttr( "nonexisting" )[0].nonexisting, undefined, "removeAttr works correctly on DOM element nodes" );

jQuery.each( [document, attributeNode, obj], function( i, ele ) {
var $ele = jQuery( ele );
$ele.attr( "nonexisting", "foo" ).removeAttr( "nonexisting" );
strictEqual( ele.nonexisting, "", "removeAttr works correctly on non DOM element nodes (bug #7500)." );
});
jQuery.each( [commentNode, textNode], function( i, ele ) {
$ele = jQuery( ele );
$ele.attr( "nonexisting", "foo" ).removeAttr( "nonexisting" );
strictEqual( ele.nonexisting, undefined, "removeAttr works correctly on non DOM element nodes (bug #7500)." );
});
});

test("val()", function() {

0 comments on commit b50f41a

Please sign in to comment.
You can’t perform that action at this time.