Skip to content
Permalink
Browse files

Very crude first pass at splitting apart the attr/prop logic. Also ad…

…ding in attrHooks/propHooks. All of it is completely untested.
  • Loading branch information...
jeresig committed Mar 7, 2011
1 parent 6c124d3 commit d4e4414451e15d23d7174e8eeddaa952ed0e4d73
Showing with 165 additions and 103 deletions.
  1. +165 −103 src/attributes.js
@@ -3,38 +3,37 @@
var rclass = /[\n\t\r]/g,
rspaces = /\s+/,
rreturn = /\r/g,
rspecialurl = /^(?:href|src|style)$/,
rtype = /^(?:button|input)$/i,
rfocusable = /^(?:button|input|object|select|textarea)$/i,
rclickable = /^a(?:rea)?$/i,
rradiocheck = /^(?:radio|checkbox)$/i;

jQuery.props = {
"for": "htmlFor",
"class": "className",
readonly: "readOnly",
maxlength: "maxLength",
cellspacing: "cellSpacing",
rowspan: "rowSpan",
colspan: "colSpan",
tabindex: "tabIndex",
usemap: "useMap",
frameborder: "frameBorder"
};

jQuery.fn.extend({
attr: function( name, value ) {
return jQuery.access( this, name, value, true, jQuery.attr );
},

removeAttr: function( name, fn ) {
return this.each(function(){
jQuery.attr( this, name, "" );
removeAttr: function( name ) {
return this.each(function() {
if ( this.nodeType === 1 ) {
this.removeAttribute( name );
}
});
},

prop: function( name, value ) {
return jQuery.access( this, name, value, true, jQuery.prop );
},

removeProp: function( name ) {
return this.each(function() {
// try/catch handles cases where IE balks (such as removing a property on window)
try {
this[ name ] = undefined;
delete this[ name ];
} catch( e ) {}
});
},

addClass: function( value ) {
if ( jQuery.isFunction(value) ) {
@@ -275,6 +274,21 @@ jQuery.extend({
height: true,
offset: true
},

// TODO: Check to see if any of these are needed anymore?
// If not, it may be good to standardize on all-lowercase names instead
attrFix: {
"for": "htmlFor",
"class": "className",
readonly: "readOnly",
maxlength: "maxLength",
cellspacing: "cellSpacing",
rowspan: "rowSpan",
colspan: "colSpan",
tabindex: "tabIndex",
usemap: "useMap",
frameborder: "frameBorder"
},

attr: function( elem, name, value, pass ) {
// don't get/set attributes on text, comment and attribute nodes
@@ -286,104 +300,152 @@ jQuery.extend({
return jQuery(elem)[name](value);
}

var notxml = elem.nodeType !== 1 || !jQuery.isXMLDoc( elem ),
// Whether we are setting (or getting)
set = value !== undefined;

var ret,
notxml = elem.nodeType !== 1 || !jQuery.isXMLDoc( elem ),
hooks;
// Try to normalize/fix the name
name = notxml && jQuery.props[ name ] || name;

// 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 );

// Safari mis-reports the default selected property of an option
// Accessing the parent's selectedIndex property fixes it
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;
}
}
name = notxml && jQuery.attrFix[ name ] || name;

hooks = jQuery.attrHooks[ name ];

if ( value !== undefined ) {

if ( hooks && "set" in hooks && notxml && (ret = hooks.set( elem, value )) !== undefined ) {

This comment has been minimized.

@dmethvin

dmethvin Mar 25, 2011

Member

The hooks should pass the attr name as a third arg so that it's possible to reuse a single hook function without creating a closure for each attr name instance. We should go back and do that for cssHooks too.

This comment has been minimized.

@timmywil

timmywil Mar 26, 2011

Member

Hmm, I'll add that.

This comment has been minimized.

@timmywil

timmywil Mar 26, 2011

Member

That actually helped me out and saved me a function call for the special treatment for forms in IE6/7. timmywil@bfda3ac

return ret;

} else {
// convert the value to a string (all browsers do this but IE) see #1070
value = "" + value;

elem.setAttribute( name, value );

return value;
}

// If applicable, access the attribute via the DOM 0 way
// 'in' checks fail in Blackberry 4.7 #6931
if ( (name in elem || elem[ name ] !== undefined) && notxml && !special ) {
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 ) {
jQuery.error( "type property can't be changed" );
}

if ( value === null ) {
if ( elem.nodeType === 1 ) {
elem.removeAttribute( name );
}

} else {
elem[ name ] = value;
}
}

// browsers index elements by id/name on forms, give priority to attributes.
if ( jQuery.nodeName( elem, "form" ) && elem.getAttributeNode(name) ) {
return elem.getAttributeNode( name ).nodeValue;

} else {

if ( hooks && "get" in hooks && notxml && (ret = hooks.get( elem )) !== undefined ) {
return ret;

} else {

if ( !jQuery.hasAttr( elem, name ) ) {
return undefined;
}

// elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set
// http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
if ( name === "tabIndex" ) {
var attributeNode = elem.getAttributeNode( "tabIndex" );
var attr = elem.getAttribute( name );

return attributeNode && attributeNode.specified ?
attributeNode.value :
rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ?
0 :
undefined;
}

return elem[ name ];
// Non-existent attributes return null, we normalize to undefined
return attr === null ?
undefined :
attr;
}

if ( !jQuery.support.style && notxml && name === "style" ) {
if ( set ) {
elem.style.cssText = "" + value;
}
},

hasAttr: function( elem, name ) {
// Blackberry 4.7 returns "" from getAttribute #6938
return elem.attributes[ name ] || (elem.hasAttribute && elem.hasAttribute( name ));
},

attrHooks: {
type: {
set: function( elem, value ) {
// We can't allow the type property to be changed (since it causes problems in IE)
if ( rtype.test( elem.nodeName ) && elem.parentNode ) {
jQuery.error( "type property can't be changed" );
}

return elem.style.cssText;
}

if ( set ) {
// convert the value to a string (all browsers do this but IE) see #1070
elem.setAttribute( name, "" + value );
},

// elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set
// http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
tabIndex: {
get: function( elem ) {
var attributeNode = elem.getAttributeNode( "tabIndex" );

return attributeNode && attributeNode.specified ?
attributeNode.value :
rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ?
0 :
undefined;
}

// Ensure that missing attributes return undefined
// Blackberry 4.7 returns "" from getAttribute #6938
if ( !elem.attributes[ name ] && (elem.hasAttribute && !elem.hasAttribute( name )) ) {
return undefined;
}
},

// TODO: Check to see if we really need any here.
propFix: {},

prop: function( elem, name, value ) {
var ret, hooks;

// Try to normalize/fix the name
name = notxml && jQuery.propFix[ name ] || name;

hooks = jQuery.propHooks[ name ];

if ( value !== undefined ) {
if ( hooks && "set" in hooks && (ret = hooks.set( elem, value )) !== undefined ) {
return ret;

} else {
return (elem[ name ] = value);
}

} else {
if ( hooks && "get" in hooks && (ret = hooks.get( elem )) !== undefined ) {
return ret;

} else {
return elem[ name ];
}
}
},

propHooks: {}
});

var attr = !jQuery.support.hrefNormalized && notxml && special ?
// Some attributes require a special call on IE
elem.getAttribute( name, 2 ) :
elem.getAttribute( name );

// Non-existent attributes return null, we normalize to undefined
return attr === null ? undefined : attr;
// Some attributes require a special call on IE
if ( !jQuery.support.hrefNormalized ) {
jQuery.each([ "href", "src", "style" ], function( i, name ) {
jQuery.attrHooks[ name ] = jQuery.extend( jQuery.attrHooks[ name ], {
get: function( elem ) {
return elem.getAttribute( name, 2 );
}
});
});
}

if ( !jQuery.support.style ) {
jQuery.attrHooks.style = {
get: function( elem ) {
return elem.style.cssText;
},

set: function( elem, value ) {
return (elem.style.cssText = "" + value);
}
// Handle everything which isn't a DOM element node
if ( set ) {
elem[ name ] = value;
};
}

// Safari mis-reports the default selected property of an option
// Accessing the parent's selectedIndex property fixes it
if ( !jQuery.support.optSelected ) {
jQuery.attrHooks.selected = {
get: function( elem ) {
var parent = elem.parentNode;

if ( parent ) {
parent.selectedIndex;

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

})( jQuery );

0 comments on commit d4e4414

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