added curly braces around all if/else statements
[jquery.git] / src / attributes.js
index de1d331..b5a29e1 100644 (file)
@@ -1,29 +1,50 @@
 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 access(this, name, value, true, jQuery.attr);
+       },
+
+       addClass: function( value ) {
+               if ( value && typeof value === "string" ) {
+                       var classNames = (value || "").split(/\s+/);
+
+                       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 + " ";
+                                               for ( var c = 0, cl = classNames.length; c < cl; c++ ) {
+                                                       if ( className.indexOf( " " + classNames[c] + " " ) < 0 ) {
+                                                               elem.className += " " + classNames[c];
+                                                       }
+                                               }
+                                       }
                                }
                        }
-               } else {                              // Multiple attributes to set on all
-                       options = name;
+               }
+
+               return this;
+       },
+
+       removeClass: function( value ) {
+               if ( (value && typeof value === "string") || value === undefined ) {
+                       var classNames = (value || "").split(/\s+/);
+
                        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 + " ";
+                                               for ( var c = 0, cl = classNames.length; c < cl; c++ ) {
+                                                       className = className.replace(" " + classNames[c] + " ", " ");
+                                               }
+                                               elem.className = className.substring(1, className.length - 1);
+                                       } else {
+                                               elem.className = "";
+                                       }
                                }
                        }
                }
@@ -32,7 +53,14 @@ jQuery.fn.extend({
        },
 
        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 + " ").indexOf( className ) > -1 ) {
+                               return true;
+                       }
+               }
+
+               return false;
        },
 
        val: function( value ) {
@@ -40,9 +68,9 @@ jQuery.fn.extend({
                        var elem = this[0];
 
                        if ( elem ) {
-                               if( jQuery.nodeName( elem, 'option' ) )
+                               if( jQuery.nodeName( elem, 'option' ) ) {
                                        return (elem.attributes.value || {}).specified ? elem.value : elem.text;
-
+                               }
                                // We need to handle select boxes special
                                if ( jQuery.nodeName( elem, "select" ) ) {
                                        var index = elem.selectedIndex,
@@ -51,9 +79,9 @@ jQuery.fn.extend({
                                                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 ];
@@ -63,9 +91,9 @@ jQuery.fn.extend({
                                                        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 );
                                                }
@@ -83,9 +111,9 @@ jQuery.fn.extend({
                }
 
                // Typecast once if the value is a number
-               if ( typeof value === "number" )
+               if ( typeof value === "number" ) {
                        value += '';
-                       
+               }       
                var val = value;
 
                return this.each(function(){
@@ -93,29 +121,30 @@ jQuery.fn.extend({
                                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( typeof val === "number" ) {
+                                       val += ''; 
+                               }
                        }
                        
-                       if ( this.nodeType != 1 )
+                       if ( this.nodeType != 1 ) {
                                return;
-
-                       if ( jQuery.isArray(val) && /radio|checkbox/.test( this.type ) )
-                               this.checked = (jQuery.inArray(this.value, val) >= 0 ||
-                                       jQuery.inArray(this.name, val) >= 0);
-
+                       }
+                       if ( jQuery.isArray(val) && /radio|checkbox/.test( this.type ) ) {
+                               this.checked = jQuery.inArray(this.value || this.name, val) >= 0;
+                       }
                        else if ( jQuery.nodeName( this, "select" ) ) {
                                var values = jQuery.makeArray(val);
 
                                jQuery( "option", this ).each(function(){
-                                       this.selected = (jQuery.inArray( this.value, values ) >= 0 ||
-                                               jQuery.inArray( this.text, values ) >= 0);
+                                       this.selected = jQuery.inArray( this.value || this.text, values ) >= 0;
                                });
 
-                               if ( !values.length )
+                               if ( !values.length ) {
                                        this.selectedIndex = -1;
-
-                       } else
+                               }
+                       } else {
                                this.value = val;
+                       }
                });
        }
 });
@@ -123,16 +152,9 @@ jQuery.fn.extend({
 jQuery.each({
        removeAttr: function( name ) {
                jQuery.attr( this, name, "" );
-               if (this.nodeType == 1)
+               if (this.nodeType == 1) {
                        this.removeAttribute( name );
-       },
-
-       addClass: function( classNames ) {
-               jQuery.className.add( this, classNames );
-       },
-
-       removeClass: function( classNames ) {
-               jQuery.className.remove( this, classNames );
+               }
        },
 
        toggleClass: function( classNames, state ) {
@@ -143,8 +165,8 @@ jQuery.each({
                                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 );
+                               state = isBool ? state : !jQuery(this).hasClass( className );
+                               jQuery(this)[ state ? "addClass" : "removeClass" ]( className );
                        }
                } else if ( type === "undefined" || type === "boolean" ) {
                        if ( this.className ) {
@@ -162,36 +184,15 @@ jQuery.each({
 });
 
 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;
-               }
-       },
-
        attr: function( elem, name, value ) {
                // don't set attributes on text and comment nodes
-               if (!elem || elem.nodeType == 3 || elem.nodeType == 8)
+               if (!elem || elem.nodeType == 3 || elem.nodeType == 8) {
                        return undefined;
-
+               }
+               if ( name in jQuery.fn && name !== "attr" ) {
+                       return jQuery(elem)[name](value);
+               }
+               
                var notxml = elem.nodeType !== 1 || !jQuery.isXMLDoc( elem ),
                        // Whether we are setting (or getting)
                        set = value !== undefined;
@@ -207,23 +208,23 @@ jQuery.extend({
 
                        // Safari mis-reports the default selected property of a hidden option
                        // Accessing the parent's selectedIndex property fixes it
-                       if ( name == "selected" && elem.parentNode )
+                       if ( name == "selected" && elem.parentNode ) {
                                elem.parentNode.selectedIndex;
-
+                       }
                        // If applicable, access the attribute via the DOM 0 way
                        if ( name in elem && notxml && !special ) {
-                               if ( set ){
+                               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 )
+                                       if ( name == "type" && /(button|input)/i.test(elem.nodeName) && elem.parentNode ) {
                                                throw "type property can't be changed";
-
+                                       }
                                        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" ) {
@@ -241,16 +242,16 @@ jQuery.extend({
                        }
 
                        if ( !jQuery.support.style && notxml && name == "style" ) {
-                               if ( set )
+                               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
                                        // Some attributes require a special call on IE
                                        ? elem.getAttribute( name, 2 )