X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fattributes.js;h=30b3205a1fd3f5491c46b43fdab56fe610d3ee0e;hb=4729f4d44326fd302c63af8f3324b6c4bac54084;hp=663d660f4245433ac4d69606e15b3e600ff63730;hpb=1b67aaee74c9b683ac31893b40077abd62e6d8c6;p=jquery.git

diff --git a/src/attributes.js b/src/attributes.js
index 663d660..30b3205 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, "");
 
@@ -157,16 +164,14 @@ jQuery.fn.extend({
 				return;
 			}
 
-			if ( jQuery.isArray(val) && /radio|checkbox/.test( this.type ) ) {
-				this.checked = jQuery.inArray( this.value, 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() {
-					// IE 6 will return "" for the value if one isn't specified, instead of the text
-					var node = this.getAttributeNode("value");
-					this.selected = jQuery.inArray( node && node.specified ? node.value : this.value || this.text, values ) >= 0;
+					this.selected = jQuery.inArray( jQuery(this).val(), values ) >= 0;
 				});
 
 				if ( !values.length ) {
@@ -256,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
 			// 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