Removed .removeAttr(Function), it didn't really make sense.

[jquery.git] / src / attributes.js

diff --git a/src/attributes.js b/src/attributes.js
index 664a024..004c6b3 100644 (file)
--- a/src/attributes.js
+++ b/src/attributes.js
@@ -12,14 +12,7 @@ jQuery.fn.extend({
                return access( this, name, value, true, jQuery.attr );
        },
 
-       removeAttr: function( name ) {
-               if ( jQuery.isFunction( name ) ) {
-                       return this.each(function(i) {
-                               var self = jQuery(this);
-                               self.removeAttr( name.call(this, i, self.attr(name)) );
-                       });
-               }
-
+       removeAttr: function( name, fn ) {
                return this.each(function(){
                        jQuery.attr( this, name, "" );
                        if ( this.nodeType === 1 ) {
@@ -93,26 +86,27 @@ jQuery.fn.extend({
                return this;
        },
 
-       toggleClass: function( classNames, state ) {
-               var type = typeof classNames;
+       toggleClass: function( value, stateVal ) {
+               var type = typeof value, isBool = typeof stateVal === "boolean";
 
-               if ( jQuery.isFunction( classNames ) ) {
+               if ( jQuery.isFunction( value ) ) {
                        return this.each(function(i) {
                                var self = jQuery(this);
-                               self.toggleClass( classNames.call(this, i, self.attr("class")), state );
+                               self.toggleClass( value.call(this, i, self.attr("class"), stateVal), stateVal );
                        });
                }
 
-               return this.each(function(){
+               return this.each(function() {
                        if ( type === "string" ) {
                                // toggle individual class names
-                               var isBool = typeof state === "boolean", className, i = 0,
-                                       classNames = classNames.split( rspace );
+                               var className, i = 0, self = jQuery(this),
+                                       state = stateVal,
+                                       classNames = value.split( rspace );
 
                                while ( (className = classNames[ i++ ]) ) {
                                        // check each className given, space seperated list
-                                       state = isBool ? state : !jQuery(this).hasClass( className );
-                                       jQuery(this)[ state ? "addClass" : "removeClass" ]( className );
+                                       state = isBool ? state : !self.hasClass( className );
+                                       self[ state ? "addClass" : "removeClass" ]( className );
                                }
 
                        } else if ( type === "undefined" || type === "boolean" ) {
@@ -122,7 +116,7 @@ jQuery.fn.extend({
                                }
 
                                // toggle whole className
-                               this.className = this.className || classNames === false ? "" : jQuery.data( this, "__className__" ) || "";
+                               this.className = this.className || value === false ? "" : jQuery.data( this, "__className__" ) || "";
                        }
                });
        },
@@ -194,28 +188,23 @@ jQuery.fn.extend({
                        return undefined;
                }
 
-               // Typecast once if the value is a number
-               if ( typeof value === "number" ) {
-                       value += "";
-               }
-
-               var val = value;
+               var isFunction = jQuery.isFunction(value);
 
                return this.each(function(i) {
-                       var self = jQuery(this);
+                       var self = jQuery(this), val = value;
 
-                       if ( jQuery.isFunction(value) ) {
-                               val = value.call(this, i, self.val());
+                       if ( this.nodeType !== 1 ) {
+                               return;
+                       }
 
-                               // Typecast each time if the value is a Function and the appended
-                               // value is therefore different each time.
-                               if ( typeof val === "number" ) {
-                                       val += "";
-                               }
+                       if ( isFunction ) {
+                               val = value.call(this, i, self.val());
                        }
 
-                       if ( this.nodeType !== 1 ) {
-                               return;
+                       // Typecast each time if the value is a Function and the appended
+                       // value is therefore different each time.
+                       if ( typeof val === "number" ) {
+                               val += "";
                        }
 
                        if ( jQuery.isArray(val) && rradiocheck.test( this.type ) ) {
@@ -225,7 +214,7 @@ jQuery.fn.extend({
                                var values = jQuery.makeArray(val);
 
                                jQuery( "option", this ).each(function() {
-                                       this.selected = jQuery.inArray( self.val(), values ) >= 0;
+                                       this.selected = jQuery.inArray( jQuery(this).val(), values ) >= 0;
                                });
 
                                if ( !values.length ) {