X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=sidebyside;f=src%2Fattributes.js;h=b3a49f50f869b8ec87f8bda334c397c291079106;hb=7b0b348419c85841671459b4d7153afc88d1fa83;hp=050978110568fd9d8b649a5e93d2f99a3cacc58c;hpb=f0366306923ecf97b487032d61c2fcc2b4b068c4;p=jquery.git

diff --git a/src/attributes.js b/src/attributes.js
index 0509781..b3a49f5 100644
--- a/src/attributes.js
+++ b/src/attributes.js
@@ -4,7 +4,8 @@ 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 ) {
@@ -127,6 +128,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, "");
 
@@ -137,19 +144,19 @@ jQuery.fn.extend({
 
 		// Typecast once if the value is a number
 		if ( typeof value === "number" ) {
-			value += '';
+			value += "";
 		}
 
 		var val = value;
 
-		return this.each(function(){
+		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 += '';
+					val += "";
 				}
 			}
 
@@ -157,14 +164,14 @@ jQuery.fn.extend({
 				return;
 			}
 
-			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( jQuery(this).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 ) {
@@ -210,10 +217,12 @@ jQuery.each({
 			this.className = this.className || classNames === false ? "" : jQuery.data( this, "__className__" ) || "";
 		}
 	}
-}, function(name, fn){
-	jQuery.fn[ name ] = function(val, state){
+}, 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(function() {
+				jQuery(this)[ name ]( val.call(this), state );
+			});
 		}
 
 		return this.each( fn, arguments );
@@ -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);
 		}
 
@@ -252,12 +261,17 @@ 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 = rspecialurl.test( name );
+			var special = rspecialurl.test( name ), parent = elem.parentNode;
 
-			// 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" && 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
@@ -268,14 +282,7 @@ jQuery.extend({
 						throw "type property can't be changed";
 					}
 
-					// browsers index elements by id/name on forms, give priority to attributes.
-					if( jQuery.nodeName( elem, "form" ) ) {
-						// convert the value to a string (all browsers do this but IE) see #1070
-						elem.setAttribute( name, "" + value );
-
-					} else {
-						elem[ name ] = value;
-					}
+					elem[ name ] = value;
 				}
 
 				// browsers index elements by id/name on forms, give priority to attributes.