Skip to content
Permalink
Browse files

Minor adjustments and cleanup, including normalizing the value to a s…

…tring when setting( list of changes below )

- Normalize set value to string to synchronize return type cross-browser

- Add style attrHook to propHooks to support style getting in all browsers for both attr and prop

- Extend the selected propHook instead of overriding a possible set function

- Remove selected propHook TODO since there is no selected content attribute and it should return null
  • Loading branch information
timmywil
timmywil committed Apr 2, 2011
1 parent 8cbf551 commit ff7576755864193b4c1a00464bf0919bbbe96e8b
Showing with 7 additions and 16 deletions.
  1. +7 −16 src/attributes.js
@@ -313,7 +313,7 @@ jQuery.extend({
return ret;

} else {
elem.setAttribute( name, value );
elem.setAttribute( name, "" + value );
return value;
}

@@ -440,10 +440,8 @@ if ( !jQuery.support.getSetAttribute ) {
var ret = elem.getAttributeNode( name );
if ( ret ) {
ret.nodeValue = value;
} else {
elem.setAttribute( name, value );
return value;
}
return value;
}
};
}
@@ -458,9 +456,6 @@ jQuery.each([ "selected", "checked", "readonly", "disabled" ], function( i, name
jQuery.removeAttr( elem, name );
return false;
}

elem.setAttribute( name, value );
return value;
}
});
});
@@ -477,7 +472,7 @@ if ( !jQuery.support.hrefNormalized ) {
}

if ( !jQuery.support.style ) {
jQuery.attrHooks.style = {
jQuery.propHooks.style = jQuery.attrHooks.style = {
get: function( elem ) {
return elem.style.cssText;
},
@@ -490,24 +485,20 @@ if ( !jQuery.support.style ) {
// Safari mis-reports the default selected property of an option
// Accessing the parent's selectedIndex property fixes it
if ( !jQuery.support.optSelected ) {

jQuery.propHooks.selected = {
jQuery.propHooks.selected = jQuery.extend( jQuery.propHooks.selected, {
get: function( elem ) {
var parent = elem.parentNode;

if ( parent ) {
parent.selectedIndex;

// TODO: We may need an attrHook for selected that simply defers to prop?
// The attr is undefined if the option is created with createElement and not on the DOM


// Make sure that it also works with optgroups, see #5701
if ( parent.parentNode ) {
parent.parentNode.selectedIndex;
}
}
}
};
});
}

})( jQuery );

0 comments on commit ff75767

Please sign in to comment.
You can’t perform that action at this time.