X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fattributes.js;h=f7fb0a2c87d46a8a0b527b7e71c34e403fe7e777;hb=d857315967a1cc07b73924bbdf2eb12f4f910c45;hp=04562ff8b0711100f555a33422d3d75ef10db13a;hpb=5e6e53835e552920db4f88ac0c9eca71aaacbef0;p=jquery.git

diff --git a/src/attributes.js b/src/attributes.js
index 04562ff..f7fb0a2 100644
--- a/src/attributes.js
+++ b/src/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 );
 			}
 		}
 
@@ -141,13 +137,12 @@ jQuery.each({
 				jQuery.className[ state ? "add" : "remove" ]( this, className );
 			}
 		} else if ( type === "undefined" || type === "boolean" ) {
-			// toggle whole className
-			if ( this.className || classNames === false ) {
+			if ( this.className ) {
+				// store className if set
 				jQuery.data( this, "__className__", this.className );
-				this.className = "";
-			} else {
-				this.className = jQuery.data( this, "__className__" ) || "";
 			}
+			// toggle whole className
+			this.className = this.className || classNames === false ? "" : jQuery.data( this, "__className__" ) || "";
 		}
 	}
 }, function(name, fn){
@@ -259,4 +254,4 @@ jQuery.extend({
 		// Using attr for specific style information is now deprecated. Use style insead.
 		return jQuery.style(elem, name, value);
 	}
-});
\ No newline at end of file
+});