Support for .foo(Function) and testing. TODO: More tests

[jquery.git] / src / attributes.js

diff --git a/src/attributes.js b/src/attributes.js
index f3e1b4c..9e66df0 100644 (file)
--- 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 );
                        }
                }
 
@@ -86,19 +82,29 @@ jQuery.fn.extend({
                        return undefined;
                }
 
+               // Typecast once if the value is a number
                if ( typeof value === "number" )
                        value += '';
+                       
+               var val = value;
 
                return this.each(function(){
+                       if(jQuery.isFunction(value)) {
+                               val = value.call(this);
+                               // Typecast each time if the value is a Function and the appended
+                               // value is therefore different each time.
+                               if( typeof val === "number" ) val += '';
+                       }
+                       
                        if ( this.nodeType != 1 )
                                return;
 
-                       if ( jQuery.isArray(value) && /radio|checkbox/.test( this.type ) )
-                               this.checked = (jQuery.inArray(this.value, value) >= 0 ||
-                                       jQuery.inArray(this.name, value) >= 0);
+                       if ( jQuery.isArray(val) && /radio|checkbox/.test( this.type ) )
+                               this.checked = (jQuery.inArray(this.value, val) >= 0 ||
+                                       jQuery.inArray(this.name, val) >= 0);
 
                        else if ( jQuery.nodeName( this, "select" ) ) {
-                               var values = jQuery.makeArray(value);
+                               var values = jQuery.makeArray(val);
 
                                jQuery( "option", this ).each(function(){
                                        this.selected = (jQuery.inArray( this.value, values ) >= 0 ||
@@ -109,7 +115,7 @@ jQuery.fn.extend({
                                        this.selectedIndex = -1;
 
                        } else
-                               this.value = value;
+                               this.value = val;
                });
        }
 });
@@ -258,4 +264,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
+});