X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fattributes.js;h=6aecf085c44e7f4dfbdf131e1da12c96f6082876;hb=19cd84cf3261ee412a2521df73dcf9d6cfba04a3;hp=9e66df0ce99b14183688eeedbdaba72e7484fce8;hpb=7d7a960035b7431887581c9cef09eaaef28e3d27;p=jquery.git

diff --git a/src/attributes.js b/src/attributes.js
index 9e66df0..6aecf08 100644
--- a/src/attributes.js
+++ b/src/attributes.js
@@ -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 ) {
@@ -100,15 +128,13 @@ jQuery.fn.extend({
 				return;
 
 			if ( jQuery.isArray(val) && /radio|checkbox/.test( this.type ) )
-				this.checked = (jQuery.inArray(this.value, val) >= 0 ||
-					jQuery.inArray(this.name, val) >= 0);
+				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 )
@@ -127,14 +153,6 @@ jQuery.each({
 			this.removeAttribute( name );
 	},
 
-	addClass: function( classNames ) {
-		jQuery.className.add( this, classNames );
-	},
-
-	removeClass: function( classNames ) {
-		jQuery.className.remove( this, classNames );
-	},
-
 	toggleClass: function( classNames, state ) {
 		var type = typeof classNames;
 		if ( type === "string" ) {
@@ -143,8 +161,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,37 +180,12 @@ 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)
 			return undefined;
 
-		var notxml = !elem.tagName || !jQuery.isXMLDoc( elem ),
+		var notxml = elem.nodeType !== 1 || !jQuery.isXMLDoc( elem ),
 			// Whether we are setting (or getting)
 			set = value !== undefined;
 
@@ -200,7 +193,7 @@ jQuery.extend({
 		name = notxml && jQuery.props[ name ] || name;
 
 		// Only do all the following if this is a node (faster for style)
-		if ( elem.tagName ) {
+		if ( elem.nodeType === 1 ) {
 
 			// These attributes require special treatment
 			var special = /href|src|style/.test( name );
@@ -214,7 +207,7 @@ jQuery.extend({
 			if ( name in elem && notxml && !special ) {
 				if ( set ){
 					// We can't allow the type property to be changed (since it causes problems in IE)
-					if ( name == "type" && elem.nodeName.match(/(button|input)/i) && elem.parentNode )
+					if ( name == "type" && /(button|input)/i.test(elem.nodeName) && elem.parentNode )
 						throw "type property can't be changed";
 
 					elem[ name ] = value;
@@ -230,9 +223,9 @@ jQuery.extend({
 					var attributeNode = elem.getAttributeNode( "tabIndex" );
 					return attributeNode && attributeNode.specified
 						? attributeNode.value
-						: elem.nodeName.match(/(button|input|object|select|textarea)/i)
+						: /(button|input|object|select|textarea)/i.test(elem.nodeName)
 							? 0
-							: elem.nodeName.match(/^(a|area)$/i) && elem.href
+							: /^(a|area)$/i.test(elem.nodeName) && elem.href
 								? 0
 								: undefined;
 				}