+var rclass = /[\n\t]/g;
+
jQuery.fn.extend({
attr: function( name, value ) {
- var options = name, isFunction = jQuery.isFunction( value );
+ return access(this, name, value, true, jQuery.attr);
+ },
- if ( typeof name === "string" ) {
- // Are we setting the attribute?
- if ( value === undefined ) {
- return this.length ?
- jQuery.attr( this[0], name ) :
- null;
+ addClass: function( value ) {
+ if(jQuery.isFunction(value)) {
+ return this.each(function() {
+ jQuery(this).addClass( value.call(this) );
+ });
+ }
- // Convert name, value params to options hash format
- } else {
- options = {};
- options[ name ] = value;
+ if ( value && typeof value === "string" ) {
+ var classNames = (value || "").split(/\s+/);
+
+ for ( var i = 0, l = this.length; i < l; i++ ) {
+ var elem = this[i];
+
+ if ( elem.nodeType === 1 ) {
+ if ( !elem.className ) {
+ elem.className = value;
+ } else {
+ var className = " " + elem.className + " ";
+ for ( var c = 0, cl = classNames.length; c < cl; c++ ) {
+ if ( className.indexOf( " " + classNames[c] + " " ) < 0 ) {
+ elem.className += " " + classNames[c];
+ }
+ }
+ }
+ }
}
}
- // For each element...
- for ( var i = 0, l = this.length; i < l; i++ ) {
- var elem = this[i];
+ return this;
+ },
+
+ removeClass: function( value ) {
+ if(jQuery.isFunction(value)) {
+ return this.each(function() {
+ jQuery(this).removeClass( value.call(this) );
+ });
+ }
- // Set all the attributes
- for ( var prop in options ) {
- value = options[prop];
+ if ( (value && typeof value === "string") || value === undefined ) {
+ var classNames = (value || "").split(/\s+/);
- if ( isFunction ) {
- value = value.call( elem, i );
- }
+ for ( var i = 0, l = this.length; i < l; i++ ) {
+ var elem = this[i];
- jQuery.attr( elem, prop, value );
+ if ( elem.nodeType === 1 && elem.className ) {
+ if ( value ) {
+ var className = (" " + elem.className + " ").replace(rclass, " ");
+ for ( var c = 0, cl = classNames.length; c < cl; c++ ) {
+ className = className.replace(" " + classNames[c] + " ", " ");
+ }
+ elem.className = className.substring(1, className.length - 1);
+ } else {
+ elem.className = "";
+ }
+ }
}
}
},
hasClass: function( selector ) {
- return !!selector && this.is( "." + selector );
+ var className = " " + selector + " ";
+ for ( var i = 0, l = this.length; i < l; i++ ) {
+ if ( (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) > -1 ) {
+ return true;
+ }
+ }
+
+ return false;
},
val: function( value ) {
var elem = this[0];
if ( elem ) {
- if( jQuery.nodeName( elem, 'option' ) )
+ if( jQuery.nodeName( elem, 'option' ) ) {
return (elem.attributes.value || {}).specified ? elem.value : elem.text;
-
+ }
// We need to handle select boxes special
if ( jQuery.nodeName( elem, "select" ) ) {
var index = elem.selectedIndex,
one = elem.type == "select-one";
// Nothing was selected
- if ( index < 0 )
+ if ( index < 0 ) {
return null;
-
+ }
// Loop through all the selected options
for ( var i = one ? index : 0, max = one ? index + 1 : options.length; i < max; i++ ) {
var option = options[ i ];
value = jQuery(option).val();
// We don't need an array for one selects
- if ( one )
+ if ( one ) {
return value;
-
+ }
// Multi-Selects return an array
values.push( value );
}
return undefined;
}
- if ( typeof value === "number" )
+ // Typecast once if the value is a number
+ if ( typeof value === "number" ) {
value += '';
+ }
+ var val = value;
return this.each(function(){
- 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.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(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 )
+ if ( !values.length ) {
this.selectedIndex = -1;
-
- } else
- this.value = value;
+ }
+ } else {
+ this.value = val;
+ }
});
}
});
jQuery.each({
removeAttr: function( name ) {
jQuery.attr( this, name, "" );
- if (this.nodeType == 1)
+ if ( this.nodeType === 1 ) {
this.removeAttribute( name );
- },
-
- addClass: function( classNames ) {
- jQuery.className.add( this, classNames );
- },
-
- removeClass: function( classNames ) {
- jQuery.className.remove( this, classNames );
+ }
},
toggleClass: function( classNames, state ) {
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 );
+ state = isBool ? state : !jQuery(this).hasClass( className );
+ jQuery(this)[ state ? "addClass" : "removeClass" ]( className );
}
} else if ( type === "undefined" || type === "boolean" ) {
if ( this.className ) {
}
}
}, function(name, fn){
- jQuery.fn[ name ] = function(){
+ jQuery.fn[ name ] = function(val, state){
+ if( jQuery.isFunction( val ) ) {
+ return this.each(function() { jQuery(this)[ name ]( val.call(this), state ); });
+ }
+
return this.each( fn, arguments );
};
});
jQuery.extend({
- className: {
- // internal only, use addClass("class")
- add: function( elem, classNames ) {
- jQuery.each((classNames || "").split(/\s+/), function(i, className){
- if ( elem.nodeType == 1 && !jQuery.className.has( elem.className, className ) )
- elem.className += (elem.className ? " " : "") + className;
- });
- },
-
- // internal only, use removeClass("class")
- remove: function( elem, classNames ) {
- if (elem.nodeType == 1)
- elem.className = classNames !== undefined ?
- jQuery.grep(elem.className.split(/\s+/), function(className){
- return !jQuery.className.has( classNames, className );
- }).join(" ") :
- "";
- },
-
- // internal only, use hasClass("class")
- has: function( elem, className ) {
- return elem && jQuery.inArray( className, (elem.className || elem).toString().split(/\s+/) ) > -1;
- }
+ attrFn: {
+ val: true,
+ addClass: true,
+ css: true,
+ html: true,
+ text: true,
+ append: true,
+ prepend: true,
+ data: true,
+ width: true,
+ height: true,
+ offset: true,
+ bind: true
},
-
+
attr: function( elem, name, value ) {
// don't set attributes on text and comment nodes
- if (!elem || elem.nodeType == 3 || elem.nodeType == 8)
+ if (!elem || elem.nodeType == 3 || elem.nodeType == 8) {
return undefined;
+ }
+
+ if ( name in jQuery.attrFn && value !== undefined ) {
+ return jQuery(elem)[name](value);
+ }
- 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 );
// Safari mis-reports the default selected property of a hidden option
// Accessing the parent's selectedIndex property fixes it
- if ( name == "selected" && elem.parentNode )
+ if ( name == "selected" && elem.parentNode ) {
elem.parentNode.selectedIndex;
-
+ }
// If applicable, access the attribute via the DOM 0 way
if ( name in elem && notxml && !special ) {
- if ( set ){
+ 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;
+ }
+ // browsers index elements by id/name on forms, give priority to attributes.
+ if( jQuery.nodeName( elem, "form" ) ) {
+ // convert the value to a string (all browsers do this but IE) see #1070
+ elem.setAttribute( name, "" + value );
+ } else {
+ elem[ name ] = value;
+ }
}
// browsers index elements by id/name on forms, give priority to attributes.
- if( jQuery.nodeName( elem, "form" ) && elem.getAttributeNode(name) )
+ if( jQuery.nodeName( elem, "form" ) && elem.getAttributeNode(name) ) {
return elem.getAttributeNode( name ).nodeValue;
-
+ }
// 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" );
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;
}
}
if ( !jQuery.support.style && notxml && name == "style" ) {
- if ( set )
+ if ( set ) {
elem.style.cssText = "" + value;
-
+ }
return elem.style.cssText;
}
- if ( set )
+ if ( set ) {
// convert the value to a string (all browsers do this but IE) see #1070
elem.setAttribute( name, "" + value );
-
+ }
var attr = !jQuery.support.hrefNormalized && notxml && special
// Some attributes require a special call on IE
? elem.getAttribute( name, 2 )
// 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