jQuery.fn.extend({
attr: function( name, value ) {
- var options = name, isFunction = jQuery.isFunction( value );
+ var elem, options, isFunction = jQuery.isFunction(value);
- if ( typeof name === "string" ) {
- // Are we setting the attribute?
- if ( value === undefined ) {
+ if ( typeof name === "string" ) { // A single attribute
+ if ( value === undefined ) { // Query it on first element
return this.length ?
jQuery.attr( this[0], name ) :
null;
-
- // Convert name, value params to options hash format
- } else {
- options = {};
- options[ name ] = value;
+ } else { // Set it on all elements
+ for ( var i = 0, l = this.length; i < l; i++ ) {
+ elem = this[i];
+ if ( isFunction )
+ value = value.call(elem,i);
+ jQuery.attr( elem, name, value );
+ }
}
- }
-
- // For each element...
- for ( var i = 0, l = this.length; i < l; i++ ) {
- var elem = this[i];
-
- // Set all the attributes
- for ( var prop in options ) {
- value = options[prop];
-
- if ( isFunction ) {
- value = value.call( elem, i );
+ } else { // Multiple attributes to set on all
+ options = name;
+ for ( var i = 0, l = this.length; i < l; i++ ) {
+ elem = this[i];
+ for ( name in options ) {
+ value = options[name];
+ if ( jQuery.isFunction(value) )
+ value = value.call(elem,i);
+ jQuery.attr( elem, name, value );
}
-
- jQuery.attr( elem, prop, value );
}
}
return undefined;
}
+ // Typecast once if the value is a number
if ( typeof value === "number" )
value += '';
+
+ var val = value;
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 += '';
+ }
+
if ( this.nodeType != 1 )
return;
- if ( jQuery.isArray(value) && /radio|checkbox/.test( this.type ) )
- this.checked = (jQuery.inArray(this.value, value) >= 0 ||
- jQuery.inArray(this.name, value) >= 0);
+ if ( jQuery.isArray(val) && /radio|checkbox/.test( this.type ) )
+ this.checked = jQuery.inArray(this.value || this.name, val) >= 0;
else if ( jQuery.nodeName( this, "select" ) ) {
- var values = jQuery.makeArray(value);
+ var values = jQuery.makeArray(val);
jQuery( "option", this ).each(function(){
- this.selected = (jQuery.inArray( this.value, values ) >= 0 ||
- jQuery.inArray( this.text, values ) >= 0);
+ this.selected = jQuery.inArray( this.value || this.text, values ) >= 0;
});
if ( !values.length )
this.selectedIndex = -1;
} else
- this.value = value;
+ this.value = val;
});
}
});
},
toggleClass: function( classNames, state ) {
- if( typeof state !== "boolean" )
- state = !jQuery.className.has( this, classNames );
- jQuery.className[ state ? "add" : "remove" ]( this, classNames );
+ var type = typeof classNames;
+ if ( type === "string" ) {
+ // toggle individual class names
+ var isBool = typeof state === "boolean", className, i = 0,
+ classNames = classNames.split( /\s+/ );
+ while ( (className = classNames[ i++ ]) ) {
+ // check each className given, space seperated list
+ state = isBool ? state : !jQuery.className.has( this, className );
+ jQuery.className[ state ? "add" : "remove" ]( this, className );
+ }
+ } else if ( type === "undefined" || type === "boolean" ) {
+ if ( this.className ) {
+ // store className if set
+ jQuery.data( this, "__className__", this.className );
+ }
+ // toggle whole className
+ this.className = this.className || classNames === false ? "" : jQuery.data( this, "__className__" ) || "";
+ }
}
}, function(name, fn){
jQuery.fn[ name ] = function(){
if (!elem || elem.nodeType == 3 || elem.nodeType == 8)
return undefined;
- var notxml = !elem.tagName || !jQuery.isXMLDoc( elem ),
+ var notxml = elem.nodeType !== 1 || !jQuery.isXMLDoc( elem ),
// Whether we are setting (or getting)
set = value !== undefined;
name = notxml && jQuery.props[ name ] || name;
// Only do all the following if this is a node (faster for style)
- if ( elem.tagName ) {
+ if ( elem.nodeType === 1 ) {
// These attributes require special treatment
var special = /href|src|style/.test( name );
if ( name in elem && notxml && !special ) {
if ( set ){
// We can't allow the type property to be changed (since it causes problems in IE)
- if ( name == "type" && elem.nodeName.match(/(button|input)/i) && elem.parentNode )
+ if ( name == "type" && /(button|input)/i.test(elem.nodeName) && elem.parentNode )
throw "type property can't be changed";
elem[ name ] = value;
var attributeNode = elem.getAttributeNode( "tabIndex" );
return attributeNode && attributeNode.specified
? attributeNode.value
- : elem.nodeName.match(/(button|input|object|select|textarea)/i)
+ : /(button|input|object|select|textarea)/i.test(elem.nodeName)
? 0
- : elem.nodeName.match(/^(a|area)$/i) && elem.href
+ : /^(a|area)$/i.test(elem.nodeName) && elem.href
? 0
: undefined;
}
// Using attr for specific style information is now deprecated. Use style insead.
return jQuery.style(elem, name, value);
}
-});
\ No newline at end of file
+});
git.asbjorn.biz / jquery.git / blobdiff