X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fattributes.js;h=aca9e055dbdf1e113ca5d798230fb103cd7130c2;hb=b3ccf2f2881d9ad988aba1cf3ccffb810063ab29;hp=90f3062ed29e76bb17dbf6c4a8bb59723e779268;hpb=27d65b59f96460987abb84dadc3a75dde8826b3a;p=jquery.git

diff --git a/src/attributes.js b/src/attributes.js
index 90f3062..aca9e05 100644
--- a/src/attributes.js
+++ b/src/attributes.js
@@ -4,17 +4,28 @@ var rclass = /[\n\t]/g,
 	rspecialurl = /href|src|style/,
 	rtype = /(button|input)/i,
 	rfocusable = /(button|input|object|select|textarea)/i,
-	rclickable = /^(a|area)$/i;
+	rclickable = /^(a|area)$/i,
+	rradiocheck = /radio|checkbox/;
 
 jQuery.fn.extend({
 	attr: function( name, value ) {
-		return access( this, name, value, true, jQuery.attr );
+		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() {
-				jQuery(this).addClass( value.call(this) );
+			return this.each(function(i) {
+				var self = jQuery(this);
+				self.addClass( value.call(this, i, self.attr("class")) );
 			});
 		}
 
@@ -29,12 +40,13 @@ jQuery.fn.extend({
 						elem.className = value;
 
 					} else {
-						var className = " " + elem.className + " ";
+						var className = " " + elem.className + " ", setClass = elem.className;
 						for ( var c = 0, cl = classNames.length; c < cl; c++ ) {
 							if ( className.indexOf( " " + classNames[c] + " " ) < 0 ) {
-								elem.className += " " + classNames[c];
+								setClass += " " + classNames[c];
 							}
 						}
+						elem.className = jQuery.trim( setClass );
 					}
 				}
 			}
@@ -45,8 +57,9 @@ jQuery.fn.extend({
 
 	removeClass: function( value ) {
 		if ( jQuery.isFunction(value) ) {
-			return this.each(function() {
-				jQuery(this).removeClass( value.call(this) );
+			return this.each(function(i) {
+				var self = jQuery(this);
+				self.removeClass( value.call(this, i, self.attr("class")) );
 			});
 		}
 
@@ -62,7 +75,7 @@ jQuery.fn.extend({
 						for ( var c = 0, cl = classNames.length; c < cl; c++ ) {
 							className = className.replace(" " + classNames[c] + " ", " ");
 						}
-						elem.className = className.substring(1, className.length - 1);
+						elem.className = jQuery.trim( className );
 
 					} else {
 						elem.className = "";
@@ -74,6 +87,41 @@ 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( rspace );
+
+				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 ) {
 		var className = " " + selector + " ";
 		for ( var i = 0, l = this.length; i < l; i++ ) {
@@ -127,6 +175,12 @@ 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(rreturn, "");
 
@@ -135,36 +189,33 @@ jQuery.fn.extend({
 			return undefined;
 		}
 
-		// Typecast once if the value is a number
-		if ( typeof value === "number" ) {
-			value += '';
-		}
+		var isFunction = jQuery.isFunction(value);
 
-		var val = value;
+		return this.each(function(i) {
+			var self = jQuery(this), val = value;
 
-		return this.each(function(){
-			if ( jQuery.isFunction(value) ) {
-				val = value.call(this);
+			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) && /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" ) ) {
 				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 ) {
@@ -178,48 +229,6 @@ jQuery.fn.extend({
 	}
 });
 
-jQuery.each({
-	removeAttr: function( name ) {
-		jQuery.attr( this, name, "" );
-		if ( this.nodeType === 1 ) {
-			this.removeAttribute( name );
-		}
-	},
-
-	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( 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 );
-			}
-
-		} 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__" ) || "";
-		}
-	}
-}, function(name, fn){
-	jQuery.fn[ name ] = function(val, state){
-		if ( jQuery.isFunction( val ) ) {
-			return this.each(function() { jQuery(this)[ name ]( val.call(this), state ); });
-		}
-
-		return this.each( fn, arguments );
-	};
-});
-
 jQuery.extend({
 	attrFn: {
 		val: true,
@@ -232,13 +241,13 @@ jQuery.extend({
 		offset: true
 	},
 		
-	attr: function( elem, name, value ) {
+	attr: function( elem, name, value, pass ) {
 		// don't set attributes on text and comment nodes
 		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 ) {
 			return undefined;
 		}
 
-		if ( name in jQuery.attrFn && value !== undefined ) {
+		if ( pass && name in jQuery.attrFn ) {
 			return jQuery(elem)[name](value);
 		}
 
@@ -254,10 +263,18 @@ jQuery.extend({
 			// These attributes require special treatment
 			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
@@ -265,7 +282,7 @@ jQuery.extend({
 				if ( set ) {
 					// We can't allow the type property to be changed (since it causes problems in IE)
 					if ( name === "type" && rtype.test( elem.nodeName ) && elem.parentNode ) {
-						throw "type property can't be changed";
+						jQuery.error( "type property can't be changed" );
 					}
 
 					elem[ name ] = value;
@@ -314,7 +331,7 @@ jQuery.extend({
 		}
 
 		// elem is actually elem.style ... set the style
-		// Using attr for specific style information is now deprecated. Use style insead.
+		// Using attr for specific style information is now deprecated. Use style instead.
 		return jQuery.style( elem, name, value );
 	}
 });