Very crude first pass at splitting apart the attr/prop logic. Also adding in attrHooks/propHooks. All of it is completely untested.
This commit is contained in:
jeresig
timmywil
parent
fcc112f406
commit
ab4e300919
|
|
@ -3,38 +3,37 @@
|
||||||
var rclass = /[\n\t\r]/g,
|
var rclass = /[\n\t\r]/g,
|
||||||
rspaces = /\s+/,
|
rspaces = /\s+/,
|
||||||
rreturn = /\r/g,
|
rreturn = /\r/g,
|
||||||
rspecialurl = /^(?:href|src|style)$/,
|
|
||||||
rtype = /^(?:button|input)$/i,
|
rtype = /^(?:button|input)$/i,
|
||||||
rfocusable = /^(?:button|input|object|select|textarea)$/i,
|
rfocusable = /^(?:button|input|object|select|textarea)$/i,
|
||||||
rclickable = /^a(?:rea)?$/i,
|
rclickable = /^a(?:rea)?$/i,
|
||||||
rradiocheck = /^(?:radio|checkbox)$/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({
|
jQuery.fn.extend({
|
||||||
attr: function( name, value ) {
|
attr: function( name, value ) {
|
||||||
return jQuery.access( this, name, value, true, jQuery.attr );
|
return jQuery.access( this, name, value, true, jQuery.attr );
|
||||||
},
|
},
|
||||||
|
|
||||||
removeAttr: function( name, fn ) {
|
removeAttr: function( name ) {
|
||||||
return this.each(function(){
|
return this.each(function() {
|
||||||
jQuery.attr( this, name, "" );
|
|
||||||
if ( this.nodeType === 1 ) {
|
if ( this.nodeType === 1 ) {
|
||||||
this.removeAttribute( name );
|
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 ) {
|
addClass: function( value ) {
|
||||||
if ( jQuery.isFunction(value) ) {
|
if ( jQuery.isFunction(value) ) {
|
||||||
|
|
@ -275,6 +274,21 @@ jQuery.extend({
|
||||||
height: true,
|
height: true,
|
||||||
offset: 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 ) {
|
attr: function( elem, name, value, pass ) {
|
||||||
// don't get/set attributes on text, comment and attribute nodes
|
// don't get/set attributes on text, comment and attribute nodes
|
||||||
|
|
@ -286,104 +300,152 @@ jQuery.extend({
|
||||||
return jQuery(elem)[name](value);
|
return jQuery(elem)[name](value);
|
||||||
}
|
}
|
||||||
|
|
||||||
var notxml = elem.nodeType !== 1 || !jQuery.isXMLDoc( elem ),
|
var ret,
|
||||||
// Whether we are setting (or getting)
|
notxml = elem.nodeType !== 1 || !jQuery.isXMLDoc( elem ),
|
||||||
set = value !== undefined;
|
hooks;
|
||||||
|
|
||||||
// Try to normalize/fix the name
|
// Try to normalize/fix the name
|
||||||
name = notxml && jQuery.props[ name ] || name;
|
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 ) {
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
|
||||||
|
} else {
|
||||||
|
|
||||||
|
if ( hooks && "get" in hooks && notxml && (ret = hooks.get( elem )) !== undefined ) {
|
||||||
|
return ret;
|
||||||
|
|
||||||
|
} else {
|
||||||
|
|
||||||
|
if ( !jQuery.hasAttr( elem, name ) ) {
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
|
||||||
// Only do all the following if this is a node (faster for style)
|
var attr = elem.getAttribute( name );
|
||||||
if ( elem.nodeType === 1 ) {
|
|
||||||
// These attributes require special treatment
|
|
||||||
var special = rspecialurl.test( name );
|
|
||||||
|
|
||||||
// Safari mis-reports the default selected property of an option
|
// Non-existent attributes return null, we normalize to undefined
|
||||||
// Accessing the parent's selectedIndex property fixes it
|
return attr === null ?
|
||||||
if ( name === "selected" && !jQuery.support.optSelected ) {
|
undefined :
|
||||||
var parent = elem.parentNode;
|
attr;
|
||||||
if ( parent ) {
|
}
|
||||||
parent.selectedIndex;
|
}
|
||||||
|
},
|
||||||
// Make sure that it also works with optgroups, see #5701
|
|
||||||
if ( parent.parentNode ) {
|
hasAttr: function( elem, name ) {
|
||||||
parent.parentNode.selectedIndex;
|
// 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" );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
// 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" );
|
||||||
|
|
||||||
// If applicable, access the attribute via the DOM 0 way
|
return attributeNode && attributeNode.specified ?
|
||||||
// 'in' checks fail in Blackberry 4.7 #6931
|
attributeNode.value :
|
||||||
if ( (name in elem || elem[ name ] !== undefined) && notxml && !special ) {
|
rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ?
|
||||||
if ( set ) {
|
0 :
|
||||||
// We can't allow the type property to be changed (since it causes problems in IE)
|
undefined;
|
||||||
if ( name === "type" && rtype.test( elem.nodeName ) && elem.parentNode ) {
|
}
|
||||||
jQuery.error( "type property can't be changed" );
|
}
|
||||||
}
|
},
|
||||||
|
|
||||||
if ( value === null ) {
|
// TODO: Check to see if we really need any here.
|
||||||
if ( elem.nodeType === 1 ) {
|
propFix: {},
|
||||||
elem.removeAttribute( name );
|
|
||||||
}
|
prop: function( elem, name, value ) {
|
||||||
|
var ret, hooks;
|
||||||
} else {
|
|
||||||
elem[ name ] = value;
|
// Try to normalize/fix the name
|
||||||
}
|
name = notxml && jQuery.propFix[ name ] || name;
|
||||||
}
|
|
||||||
|
hooks = jQuery.propHooks[ name ];
|
||||||
// browsers index elements by id/name on forms, give priority to attributes.
|
|
||||||
if ( jQuery.nodeName( elem, "form" ) && elem.getAttributeNode(name) ) {
|
if ( value !== undefined ) {
|
||||||
return elem.getAttributeNode( name ).nodeValue;
|
if ( hooks && "set" in hooks && (ret = hooks.set( elem, value )) !== undefined ) {
|
||||||
}
|
return ret;
|
||||||
|
|
||||||
// elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set
|
} else {
|
||||||
// http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
|
return (elem[ name ] = value);
|
||||||
if ( name === "tabIndex" ) {
|
}
|
||||||
var attributeNode = elem.getAttributeNode( "tabIndex" );
|
|
||||||
|
} else {
|
||||||
return attributeNode && attributeNode.specified ?
|
if ( hooks && "get" in hooks && (ret = hooks.get( elem )) !== undefined ) {
|
||||||
attributeNode.value :
|
return ret;
|
||||||
rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ?
|
|
||||||
0 :
|
} else {
|
||||||
undefined;
|
|
||||||
}
|
|
||||||
|
|
||||||
return elem[ name ];
|
return elem[ name ];
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( !jQuery.support.style && notxml && name === "style" ) {
|
|
||||||
if ( set ) {
|
|
||||||
elem.style.cssText = "" + value;
|
|
||||||
}
|
|
||||||
|
|
||||||
return elem.style.cssText;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( set ) {
|
|
||||||
// convert the value to a string (all browsers do this but IE) see #1070
|
|
||||||
elem.setAttribute( name, "" + value );
|
|
||||||
}
|
|
||||||
|
|
||||||
// Ensure that missing attributes return undefined
|
|
||||||
// Blackberry 4.7 returns "" from getAttribute #6938
|
|
||||||
if ( !elem.attributes[ name ] && (elem.hasAttribute && !elem.hasAttribute( name )) ) {
|
|
||||||
return undefined;
|
|
||||||
}
|
|
||||||
|
|
||||||
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;
|
|
||||||
}
|
}
|
||||||
// Handle everything which isn't a DOM element node
|
},
|
||||||
if ( set ) {
|
|
||||||
elem[ name ] = value;
|
propHooks: {}
|
||||||
}
|
|
||||||
return elem[ name ];
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// 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);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
// 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;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
})( jQuery );
|
})( jQuery );
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue