Tagging the 1.5rc1 release.
[jquery.git] / src / attributes.js
index 93e0433..d37400a 100644 (file)
+(function( jQuery ) {
+
+var rclass = /[\n\t\r]/g,
+       rspaces = /\s+/,
+       rreturn = /\r/g,
+       rspecialurl = /^(?:href|src|style)$/,
+       rtype = /^(?:button|input)$/i,
+       rfocusable = /^(?:button|input|object|select|textarea)$/i,
+       rclickable = /^a(?:rea)?$/i,
+       rradiocheck = /^(?:radio|checkbox)$/i;
+
+jQuery.props = {
+       "for": "htmlFor",
+       "class": "className",
+       readonly: "readOnly",
+       maxlength: "maxLength",
+       cellspacing: "cellSpacing",
+       rowspan: "rowSpan",
+       colspan: "colSpan",
+       tabindex: "tabIndex",
+       usemap: "useMap",
+       frameborder: "frameBorder"
+};
+
 jQuery.fn.extend({
        attr: function( name, value ) {
-               var elem, options, isFunction = jQuery.isFunction(value);
-
-               if ( typeof name === "string" ) {     // A single attribute
-                       if ( value === undefined ) {        // Query it on first element
-                               return this.length ?
-                                       jQuery.attr( this[0], name ) :
-                                       null;
-                       } 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 );
+               return jQuery.access( this, name, value, true, jQuery.attr );
+       },
+
+       removeAttr: function( name, fn ) {
+               return this.each(function(){
+                       jQuery.attr( this, name, "" );
+                       if ( this.nodeType === 1 ) {
+                               this.removeAttribute( name );
+                       }
+               });
+       },
+
+       addClass: function( value ) {
+               if ( jQuery.isFunction(value) ) {
+                       return this.each(function(i) {
+                               var self = jQuery(this);
+                               self.addClass( value.call(this, i, self.attr("class")) );
+                       });
+               }
+
+               if ( value && typeof value === "string" ) {
+                       var classNames = (value || "").split( rspaces );
+
+                       for ( var i = 0, l = this.length; i < l; i++ ) {
+                               var elem = this[i];
+
+                               if ( elem.nodeType === 1 ) {
+                                       if ( !elem.className ) {
+                                               elem.className = value;
+
+                                       } else {
+                                               var className = " " + elem.className + " ",
+                                                       setClass = elem.className;
+
+                                               for ( var c = 0, cl = classNames.length; c < cl; c++ ) {
+                                                       if ( className.indexOf( " " + classNames[c] + " " ) < 0 ) {
+                                                               setClass += " " + classNames[c];
+                                                       }
+                                               }
+                                               elem.className = jQuery.trim( setClass );
+                                       }
                                }
                        }
-               } else {                              // Multiple attributes to set on all
-                       options = name;
+               }
+
+               return this;
+       },
+
+       removeClass: function( value ) {
+               if ( jQuery.isFunction(value) ) {
+                       return this.each(function(i) {
+                               var self = jQuery(this);
+                               self.removeClass( value.call(this, i, self.attr("class")) );
+                       });
+               }
+
+               if ( (value && typeof value === "string") || value === undefined ) {
+                       var classNames = (value || "").split( rspaces );
+
                        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 );
+                               var elem = this[i];
+
+                               if ( elem.nodeType === 1 && elem.className ) {
+                                       if ( value ) {
+                                               var className = (" " + elem.className + " ").replace(rclass, " ");
+                                               for ( var c = 0, cl = classNames.length; c < cl; c++ ) {
+                                                       className = className.replace(" " + classNames[c] + " ", " ");
+                                               }
+                                               elem.className = jQuery.trim( className );
+
+                                       } else {
+                                               elem.className = "";
+                                       }
                                }
                        }
                }
@@ -31,40 +104,94 @@ jQuery.fn.extend({
                return this;
        },
 
+       toggleClass: function( value, stateVal ) {
+               var type = typeof value,
+                       isBool = typeof stateVal === "boolean";
+
+               if ( jQuery.isFunction( value ) ) {
+                       return this.each(function(i) {
+                               var self = jQuery(this);
+                               self.toggleClass( value.call(this, i, self.attr("class"), stateVal), stateVal );
+                       });
+               }
+
+               return this.each(function() {
+                       if ( type === "string" ) {
+                               // toggle individual class names
+                               var className,
+                                       i = 0,
+                                       self = jQuery( this ),
+                                       state = stateVal,
+                                       classNames = value.split( rspaces );
+
+                               while ( (className = classNames[ i++ ]) ) {
+                                       // check each className given, space seperated list
+                                       state = isBool ? state : !self.hasClass( className );
+                                       self[ state ? "addClass" : "removeClass" ]( className );
+                               }
+
+                       } else if ( type === "undefined" || type === "boolean" ) {
+                               if ( this.className ) {
+                                       // store className if set
+                                       jQuery._data( this, "__className__", this.className );
+                               }
+
+                               // toggle whole className
+                               this.className = this.className || value === false ? "" : jQuery._data( this, "__className__" ) || "";
+                       }
+               });
+       },
+
        hasClass: function( selector ) {
-               return !!selector && this.is( "." + selector );
+               var className = " " + selector + " ";
+               for ( var i = 0, l = this.length; i < l; i++ ) {
+                       if ( (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) > -1 ) {
+                               return true;
+                       }
+               }
+
+               return false;
        },
 
        val: function( value ) {
-               if ( value === undefined ) {
+               if ( !arguments.length ) {
                        var elem = this[0];
 
                        if ( elem ) {
-                               if( jQuery.nodeName( elem, 'option' ) )
-                                       return (elem.attributes.value || {}).specified ? elem.value : elem.text;
+                               if ( jQuery.nodeName( elem, "option" ) ) {
+                                       // attributes.value is undefined in Blackberry 4.7 but
+                                       // uses .value. See #6932
+                                       var val = elem.attributes.value;
+                                       return !val || val.specified ? elem.value : elem.text;
+                               }
 
                                // We need to handle select boxes special
                                if ( jQuery.nodeName( elem, "select" ) ) {
                                        var index = elem.selectedIndex,
                                                values = [],
                                                options = elem.options,
-                                               one = elem.type == "select-one";
+                                               one = elem.type === "select-one";
 
                                        // Nothing was selected
-                                       if ( index < 0 )
+                                       if ( index < 0 ) {
                                                return null;
+                                       }
 
                                        // Loop through all the selected options
                                        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
-                                                       if ( one )
+                                                       if ( one ) {
                                                                return value;
+                                                       }
 
                                                        // Multi-Selects return an array
                                                        values.push( value );
@@ -74,121 +201,85 @@ jQuery.fn.extend({
                                        return values;
                                }
 
+                               // Handle the case where in Webkit "" is returned instead of "on" if a value isn't specified
+                               if ( rradiocheck.test( elem.type ) && !jQuery.support.checkOn ) {
+                                       return elem.getAttribute("value") === null ? "on" : elem.value;
+                               }
+
                                // Everything else, we just grab the value
-                               return (elem.value || "").replace(/\r/g, "");
+                               return (elem.value || "").replace(rreturn, "");
 
                        }
 
                        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(){
-                       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 this.each(function(i) {
+                       var self = jQuery(this), val = value;
+
+                       if ( this.nodeType !== 1 ) {
                                return;
+                       }
+
+                       if ( isFunction ) {
+                               val = value.call(this, i, self.val());
+                       }
+
+                       // Treat null/undefined as ""; convert numbers to string
+                       if ( val == null ) {
+                               val = "";
+                       } else if ( typeof val === "number" ) {
+                               val += "";
+                       } else if ( jQuery.isArray(val) ) {
+                               val = jQuery.map(val, function (value) {
+                                       return value == null ? "" : value + "";
+                               });
+                       }
 
-                       if ( jQuery.isArray(val) && /radio|checkbox/.test( this.type ) )
-                               this.checked = jQuery.inArray(this.value || this.name, val) >= 0;
+                       if ( jQuery.isArray(val) && rradiocheck.test( this.type ) ) {
+                               this.checked = jQuery.inArray( self.val(), val ) >= 0;
 
-                       else if ( jQuery.nodeName( this, "select" ) ) {
+                       } else if ( jQuery.nodeName( this, "select" ) ) {
                                var values = jQuery.makeArray(val);
 
-                               jQuery( "option", this ).each(function(){
-                                       this.selected = jQuery.inArray( this.value || this.text, values ) >= 0;
+                               jQuery( "option", this ).each(function() {
+                                       this.selected = jQuery.inArray( jQuery(this).val(), values ) >= 0;
                                });
 
-                               if ( !values.length )
+                               if ( !values.length ) {
                                        this.selectedIndex = -1;
+                               }
 
-                       } else
+                       } else {
                                this.value = val;
+                       }
                });
        }
 });
 
-jQuery.each({
-       removeAttr: function( name ) {
-               jQuery.attr( this, name, "" );
-               if (this.nodeType == 1)
-                       this.removeAttribute( name );
-       },
-
-       addClass: function( classNames ) {
-               jQuery.className.add( this, classNames );
-       },
-
-       removeClass: function( classNames ) {
-               jQuery.className.remove( this, classNames );
+jQuery.extend({
+       attrFn: {
+               val: true,
+               css: true,
+               html: true,
+               text: true,
+               data: true,
+               width: true,
+               height: true,
+               offset: true
        },
 
-       toggleClass: function( classNames, state ) {
-               var type = typeof classNames;
-               if ( type === "string" ) {
-                       // toggle individual class names
-                       var isBool = typeof state === "boolean", className, i = 0,
-                               classNames = classNames.split( /\s+/ );
-                       while ( (className = classNames[ i++ ]) ) {
-                               // check each className given, space seperated list
-                               state = isBool ? state : !jQuery.className.has( this, className );
-                               jQuery.className[ state ? "add" : "remove" ]( this, className );
-                       }
-               } else if ( type === "undefined" || type === "boolean" ) {
-                       if ( this.className ) {
-                               // store className if set
-                               jQuery.data( this, "__className__", this.className );
-                       }
-                       // toggle whole className
-                       this.className = this.className || classNames === false ? "" : jQuery.data( this, "__className__" ) || "";
+       attr: function( elem, name, value, pass ) {
+               // don't get/set attributes on text, comment and attribute nodes
+               if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || elem.nodeType === 2 ) {
+                       return undefined;
                }
-       }
-}, function(name, fn){
-       jQuery.fn[ name ] = function(){
-               return this.each( fn, arguments );
-       };
-});
 
-jQuery.extend({
-       className: {
-               // internal only, use addClass("class")
-               add: function( elem, classNames ) {
-                       jQuery.each((classNames || "").split(/\s+/), function(i, className){
-                               if ( elem.nodeType == 1 && !jQuery.className.has( elem.className, className ) )
-                                       elem.className += (elem.className ? " " : "") + className;
-                       });
-               },
-
-               // internal only, use removeClass("class")
-               remove: function( elem, classNames ) {
-                       if (elem.nodeType == 1)
-                               elem.className = classNames !== undefined ?
-                                       jQuery.grep(elem.className.split(/\s+/), function(className){
-                                               return !jQuery.className.has( classNames, className );
-                                       }).join(" ") :
-                                       "";
-               },
-
-               // internal only, use hasClass("class")
-               has: function( elem, className ) {
-                       return elem && jQuery.inArray( className, (elem.className || elem).toString().split(/\s+/) ) > -1;
+               if ( pass && name in jQuery.attrFn ) {
+                       return jQuery(elem)[name](value);
                }
-       },
-
-       attr: function( elem, name, value ) {
-               // don't set attributes on text and comment nodes
-               if (!elem || elem.nodeType == 3 || elem.nodeType == 8)
-                       return undefined;
 
                var notxml = elem.nodeType !== 1 || !jQuery.isXMLDoc( elem ),
                        // Whether we are setting (or getting)
@@ -199,67 +290,95 @@ jQuery.extend({
 
                // Only do all the following if this is a node (faster for style)
                if ( elem.nodeType === 1 ) {
-
                        // These attributes require special treatment
-                       var special = /href|src|style/.test( name );
+                       var special = rspecialurl.test( name );
 
-                       // Safari mis-reports the default selected property of a hidden option
+                       // Safari mis-reports the default selected property of an option
                        // Accessing the parent's selectedIndex property fixes it
-                       if ( name == "selected" && elem.parentNode )
-                               elem.parentNode.selectedIndex;
+                       if ( name === "selected" && !jQuery.support.optSelected ) {
+                               var parent = elem.parentNode;
+                               if ( parent ) {
+                                       parent.selectedIndex;
+
+                                       // Make sure that it also works with optgroups, see #5701
+                                       if ( parent.parentNode ) {
+                                               parent.parentNode.selectedIndex;
+                                       }
+                               }
+                       }
 
                        // If applicable, access the attribute via the DOM 0 way
-                       if ( name in elem && notxml && !special ) {
-                               if ( set ){
+                       // 'in' checks fail in Blackberry 4.7 #6931
+                       if ( (name in elem || elem[ name ] !== undefined) && notxml && !special ) {
+                               if ( set ) {
                                        // We can't allow the type property to be changed (since it causes problems in IE)
-                                       if ( name == "type" && /(button|input)/i.test(elem.nodeName) && elem.parentNode )
-                                               throw "type property can't be changed";
+                                       if ( name === "type" && rtype.test( elem.nodeName ) && elem.parentNode ) {
+                                               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.
-                               if( jQuery.nodeName( elem, "form" ) && elem.getAttributeNode(name) )
+                               if ( jQuery.nodeName( elem, "form" ) && elem.getAttributeNode(name) ) {
                                        return elem.getAttributeNode( name ).nodeValue;
+                               }
 
                                // elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set
                                // http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
-                               if ( name == "tabIndex" ) {
+                               if ( name === "tabIndex" ) {
                                        var attributeNode = elem.getAttributeNode( "tabIndex" );
-                                       return attributeNode && attributeNode.specified
-                                               ? attributeNode.value
-                                               : /(button|input|object|select|textarea)/i.test(elem.nodeName)
-                                                       ? 0
-                                                       : /^(a|area)$/i.test(elem.nodeName) && elem.href
-                                                               ? 0
-                                                               : undefined;
+
+                                       return attributeNode && attributeNode.specified ?
+                                               attributeNode.value :
+                                               rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ?
+                                                       0 :
+                                                       undefined;
                                }
 
                                return elem[ name ];
                        }
 
-                       if ( !jQuery.support.style && notxml && name == "style" ) {
-                               if ( set )
+                       if ( !jQuery.support.style && notxml && name === "style" ) {
+                               if ( set ) {
                                        elem.style.cssText = "" + value;
+                               }
 
                                return elem.style.cssText;
                        }
 
-                       if ( set )
+                       if ( set ) {
                                // convert the value to a string (all browsers do this but IE) see #1070
                                elem.setAttribute( name, "" + value );
+                       }
 
-                       var attr = !jQuery.support.hrefNormalized && notxml && special
+                       // Ensure that missing attributes return undefined
+                       // Blackberry 4.7 returns "" from getAttribute #6938
+                       if ( !elem.attributes[ name ] && (elem.hasAttribute && !elem.hasAttribute( name )) ) {
+                               return undefined;
+                       }
+
+                       var attr = !jQuery.support.hrefNormalized && notxml && special ?
                                        // Some attributes require a special call on IE
-                                       ? elem.getAttribute( name, 2 )
-                                       : elem.getAttribute( name );
+                                       elem.getAttribute( name, 2 ) :
+                                       elem.getAttribute( name );
 
                        // 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 insead.
-               return jQuery.style(elem, name, value);
+               // Handle everything which isn't a DOM element node
+               if ( set ) {
+                       elem[ name ] = value;
+               }
+               return elem[ name ];
        }
 });
+
+})( jQuery );