Skip to content
Permalink
Browse files

Fixes regression in .attr(), patch by David Flanagan. Fixes #4884.

  • Loading branch information
jeresig committed Jul 11, 2009
1 parent 8db967e commit 2a268f5f4b5b1d870d5af580de4c768e0121e5b5
Showing with 26 additions and 27 deletions.
  1. +20 −24 src/attributes.js
  2. +6 −3 test/unit/attributes.js
@@ -1,34 +1,30 @@
jQuery.fn.extend({
attr: function( name, value ) {
var options = name, isFunction = jQuery.isFunction( value );
var elem, options, isFunction = jQuery.isFunction(value);

if ( typeof name === "string" ) {
// Are we setting the attribute?
if ( value === undefined ) {
if ( typeof name === "string" ) { // A single attribute
if ( value === undefined ) { // Query it on first element
return this.length ?
jQuery.attr( this[0], name ) :
null;

// Convert name, value params to options hash format
} else {
options = {};
options[ name ] = value;
} else { // Set it on all elements
for ( var i = 0, l = this.length; i < l; i++ ) {
elem = this[i];
if ( isFunction )
value = value.call(elem,i);
jQuery.attr( elem, name, value );
}
}
}

// For each element...
for ( var i = 0, l = this.length; i < l; i++ ) {
var elem = this[i];

// Set all the attributes
for ( var prop in options ) {
value = options[prop];

if ( isFunction ) {
value = value.call( elem, i );
} else { // Multiple attributes to set on all
options = name;
for ( var i = 0, l = this.length; i < l; i++ ) {
elem = this[i];
for ( name in options ) {
value = options[name];
if ( jQuery.isFunction(value) )
value = value.call(elem,i);
jQuery.attr( elem, name, value );
}

jQuery.attr( elem, prop, value );
}
}

@@ -258,4 +254,4 @@ jQuery.extend({
// Using attr for specific style information is now deprecated. Use style insead.
return jQuery.style(elem, name, value);
}
});
});
@@ -68,12 +68,15 @@ test("attr(String, Function)", function() {
});

test("attr(Hash)", function() {
expect(1);
expect(3);
var pass = true;
jQuery("div").attr({foo: 'baz', zoo: 'ping'}).each(function(){
if ( this.getAttribute('foo') != "baz" && this.getAttribute('zoo') != "ping" ) pass = false;
});
ok( pass, "Set Multiple Attributes" );
equals( jQuery('#text1').attr({'value': function() { return this.id; }})[0].value, "text1", "Set attribute to computed value #1" );
equals( jQuery('#text1').attr({'title': function(i) { return i; }}).attr('title'), "0", "Set attribute to computed value #2");

});

test("attr(String, Object)", function() {
@@ -334,8 +337,8 @@ test("toggleClass(String|boolean|undefined[, boolean])", function() {
e.toggleClass(false);
e.toggleClass();
ok( e.is(".testD.testE"), "Assert class present (restored from data)" );



// Cleanup
e.removeClass("testD");

0 comments on commit 2a268f5

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