Make .attr(name, null) equivalent to removeAttr(name). (Was roughly this before ...

[jquery.git] / src / attributes.js

diff --git a/src/attributes.js b/src/attributes.js
index 719c368..ec4841b 100644 (file)
--- a/src/attributes.js
+++ b/src/attributes.js
@@ -1,11 +1,13 @@
+(function( jQuery ) {
+
 var rclass = /[\n\t]/g,
-       rspace = /\s+/,
+       rspaces = /\s+/,
        rreturn = /\r/g,
-       rspecialurl = /href|src|style/,
-       rtype = /(button|input)/i,
-       rfocusable = /(button|input|object|select|textarea)/i,
-       rclickable = /^(a|area)$/i,
-       rradiocheck = /radio|checkbox/;
+       rspecialurl = /^(?:href|src|style)$/,
+       rtype = /^(?:button|input)$/i,
+       rfocusable = /^(?:button|input|object|select|textarea)$/i,
+       rclickable = /^a(?:rea)?$/i,
+       rradiocheck = /^(?:radio|checkbox)$/i;
 
 jQuery.fn.extend({
        attr: function( name, value ) {
@@ -30,7 +32,7 @@ jQuery.fn.extend({
                }
 
                if ( value && typeof value === "string" ) {
-                       var classNames = (value || "").split( rspace );
+                       var classNames = (value || "").split( rspaces );
 
                        for ( var i = 0, l = this.length; i < l; i++ ) {
                                var elem = this[i];
@@ -64,7 +66,7 @@ jQuery.fn.extend({
                }
 
                if ( (value && typeof value === "string") || value === undefined ) {
-                       var classNames = (value || "").split(rspace);
+                       var classNames = (value || "").split( rspaces );
 
                        for ( var i = 0, l = this.length; i < l; i++ ) {
                                var elem = this[i];
@@ -102,7 +104,7 @@ jQuery.fn.extend({
                                // toggle individual class names
                                var className, i = 0, self = jQuery(this),
                                        state = stateVal,
-                                       classNames = value.split( rspace );
+                                       classNames = value.split( rspaces );
 
                                while ( (className = classNames[ i++ ]) ) {
                                        // check each className given, space seperated list
@@ -134,7 +136,7 @@ jQuery.fn.extend({
        },
 
        val: function( value ) {
-               if ( value === undefined ) {
+               if ( !arguments.length ) {
                        var elem = this[0];
 
                        if ( elem ) {
@@ -161,8 +163,11 @@ jQuery.fn.extend({
                                        for ( var i = one ? index : 0, max = one ? index + 1 : options.length; i < max; i++ ) {
                                                var option = options[ i ];
 
-                                               if ( option.selected ) {
-                                                       // Get the specifc value for the option
+                                               // Don't return options that are disabled or in a disabled optgroup
+                                               if ( option.selected && (jQuery.support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null) && 
+                                                               (!option.parentNode.disabled || !jQuery.nodeName( option.parentNode, "optgroup" )) ) {
+
+                                                       // Get the specific value for the option
                                                        value = jQuery(option).val();
 
                                                        // We don't need an array for one selects
@@ -205,9 +210,10 @@ jQuery.fn.extend({
                                val = value.call(this, i, self.val());
                        }
 
-                       // Typecast each time if the value is a Function and the appended
-                       // value is therefore different each time.
-                       if ( typeof val === "number" ) {
+                       // Treat null/undefined as ""; convert numbers to string
+                       if ( val == null ) {
+                               val = "";
+                       } else if ( typeof val === "number" ) {
                                val += "";
                        }
 
@@ -289,7 +295,14 @@ jQuery.extend({
                                                jQuery.error( "type property can't be changed" );
                                        }
 
-                                       elem[ name ] = value;
+                                       if ( value === null ) {
+                                               if ( elem.nodeType === 1 ) {
+                                                       elem.removeAttribute( name );
+                                               }
+
+                                       } else {
+                                               elem[ name ] = value;
+                                       }
                                }
 
                                // browsers index elements by id/name on forms, give priority to attributes.
@@ -327,7 +340,7 @@ jQuery.extend({
 
                        // Ensure that missing attributes return undefined
                        // Blackberry 4.7 returns "" from getAttribute #6938
-                       if ( !elem.attributes[ name ] && !elem.hasAttribute( name ) ) {
+                       if ( !elem.attributes[ name ] && (elem.hasAttribute && !elem.hasAttribute( name )) ) {
                                return undefined;
                        }
 
@@ -339,9 +352,7 @@ jQuery.extend({
                        // Non-existent attributes return null, we normalize to undefined
                        return attr === null ? undefined : attr;
                }
-
-               // elem is actually elem.style ... set the style
-               // Using attr for specific style information is now deprecated. Use style instead.
-               return jQuery.style( elem, name, value );
        }
 });
+
+})( jQuery );