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

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

Browse source
This commit is contained in:
John Resig 2009-07-11 13:57:38 +00:00
parent 8db967e9d5
commit 2a268f5f4b
2 changed files with 27 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/attributes.js
View file

@ -1,34 +1,30 @@
jQuery.fn.extend({ jQuery.fn.extend({
attr: function( name, value ) { attr: function( name, value ) {
var options = name, isFunction = jQuery.isFunction( value ); var elem, options, isFunction = jQuery.isFunction(value);
if ( typeof name === "string" ) { if ( typeof name === "string" ) { // A single attribute
// Are we setting the attribute? if ( value === undefined ) { // Query it on first element
if ( value === undefined ) {
return this.length ? return this.length ?
jQuery.attr( this[0], name ) : jQuery.attr( this[0], name ) :
null; null;
} else { // Set it on all elements
// Convert name, value params to options hash format for ( var i = 0, l = this.length; i < l; i++ ) {
} else { elem = this[i];
options = {}; if ( isFunction )
options[ name ] = value; value = value.call(elem,i);
} jQuery.attr( elem, name, value );
} }
}
// For each element... } else { // Multiple attributes to set on all
for ( var i = 0, l = this.length; i < l; i++ ) { options = name;
var elem = this[i]; for ( var i = 0, l = this.length; i < l; i++ ) {
elem = this[i];
// Set all the attributes for ( name in options ) {
for ( var prop in options ) { value = options[name];
value = options[prop]; if ( jQuery.isFunction(value) )
value = value.call(elem,i);
if ( isFunction ) { jQuery.attr( elem, name, value );
value = value.call( elem, i );
} }
jQuery.attr( elem, prop, value );
} }
} }
@ -258,4 +254,4 @@ jQuery.extend({
// Using attr for specific style information is now deprecated. Use style insead. // Using attr for specific style information is now deprecated. Use style insead.
return jQuery.style(elem, name, value); return jQuery.style(elem, name, value);
} }
}); });

9
test/unit/attributes.js
View file

@ -68,12 +68,15 @@ test("attr(String, Function)", function() {
}); });
test("attr(Hash)", function() { test("attr(Hash)", function() {
expect(1); expect(3);
var pass = true; var pass = true;
jQuery("div").attr({foo: 'baz', zoo: 'ping'}).each(function(){ jQuery("div").attr({foo: 'baz', zoo: 'ping'}).each(function(){
if ( this.getAttribute('foo') != "baz" && this.getAttribute('zoo') != "ping" ) pass = false; if ( this.getAttribute('foo') != "baz" && this.getAttribute('zoo') != "ping" ) pass = false;
}); });
ok( pass, "Set Multiple Attributes" ); 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() { test("attr(String, Object)", function() {
@ -334,8 +337,8 @@ test("toggleClass(String|boolean|undefined[, boolean])", function() {
e.toggleClass(false); e.toggleClass(false);
e.toggleClass(); e.toggleClass();
ok( e.is(".testD.testE"), "Assert class present (restored from data)" ); ok( e.is(".testD.testE"), "Assert class present (restored from data)" );
// Cleanup // Cleanup
e.removeClass("testD"); e.removeClass("testD");