rspecialurl = /href|src|style/,
rtype = /(button|input)/i,
rfocusable = /(button|input|object|select|textarea)/i,
- rclickable = /^(a|area)$/i;
+ rclickable = /^(a|area)$/i,
+ rradiocheck = /radio|checkbox/;
jQuery.fn.extend({
attr: function( name, value ) {
return access( this, name, value, true, jQuery.attr );
},
+ removeAttr: function( name ) {
+ if ( jQuery.isFunction( name ) ) {
+ return this.each(function(i) {
+ var self = jQuery(this);
+ self.removeAttr( name.call(this, i, self.attr(name)) );
+ });
+ }
+
+ return this.each(function(){
+ jQuery.attr( this, name, "" );
+ if ( this.nodeType === 1 ) {
+ this.removeAttribute( name );
+ }
+ });
+ },
+
addClass: function( value ) {
if ( jQuery.isFunction(value) ) {
- return this.each(function() {
- jQuery(this).addClass( value.call(this) );
+ return this.each(function(i) {
+ var self = jQuery(this);
+ self.addClass( value.call(this, i, self.attr("class")) );
});
}
removeClass: function( value ) {
if ( jQuery.isFunction(value) ) {
- return this.each(function() {
- jQuery(this).removeClass( value.call(this) );
+ return this.each(function(i) {
+ var self = jQuery(this);
+ self.removeClass( value.call(this, i, self.attr("class")) );
});
}
return this;
},
+ toggleClass: function( classNames, state ) {
+ var type = typeof classNames;
+
+ if ( jQuery.isFunction( classNames ) ) {
+ return this.each(function(i) {
+ var self = jQuery(this);
+ self.toggleClass( classNames.call(this, i, self.attr("class")), state );
+ });
+ }
+
+ return this.each(function(){
+ if ( type === "string" ) {
+ // toggle individual class names
+ var isBool = typeof state === "boolean", className, i = 0,
+ classNames = classNames.split( rspace );
+
+ while ( (className = classNames[ i++ ]) ) {
+ // check each className given, space seperated list
+ state = isBool ? state : !jQuery(this).hasClass( className );
+ jQuery(this)[ state ? "addClass" : "removeClass" ]( 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__" ) || "";
+ }
+ });
+ },
+
hasClass: function( selector ) {
var className = " " + selector + " ";
for ( var i = 0, l = this.length; i < l; i++ ) {
return values;
}
+ // Handle the case where in Webkit "" is returned instead of "on" if a value isn't specified
+ if ( rradiocheck.test( elem.type ) && !jQuery.support.checkOn ) {
+ return elem.getAttribute("value") === null ? "on" : elem.value;
+ }
+
+
// Everything else, we just grab the value
return (elem.value || "").replace(rreturn, "");
// Typecast once if the value is a number
if ( typeof value === "number" ) {
- value += '';
+ value += "";
}
var val = value;
- return this.each(function() {
+ return this.each(function(i) {
+ var self = jQuery(this);
+
if ( jQuery.isFunction(value) ) {
- val = value.call(this);
+ val = value.call(this, i, self.val());
// Typecast each time if the value is a Function and the appended
// value is therefore different each time.
if ( typeof val === "number" ) {
- val += '';
+ val += "";
}
}
return;
}
- if ( jQuery.isArray(val) && /radio|checkbox/.test( this.type ) ) {
- this.checked = jQuery.inArray(this.value || this.name, val) >= 0;
+ if ( jQuery.isArray(val) && rradiocheck.test( this.type ) ) {
+ this.checked = jQuery.inArray( self.val(), val ) >= 0;
} else if ( jQuery.nodeName( this, "select" ) ) {
var values = jQuery.makeArray(val);
jQuery( "option", this ).each(function() {
- this.selected = jQuery.inArray( this.value || this.text, values ) >= 0;
+ this.selected = jQuery.inArray( self.val(), values ) >= 0;
});
if ( !values.length ) {
}
});
-jQuery.each({
- removeAttr: function( name ) {
- jQuery.attr( this, name, "" );
- if ( this.nodeType === 1 ) {
- this.removeAttribute( name );
- }
- },
-
- toggleClass: function( classNames, state ) {
- var type = typeof classNames;
-
- if ( type === "string" ) {
- // toggle individual class names
- var isBool = typeof state === "boolean", className, i = 0,
- classNames = classNames.split( rspace );
-
- while ( (className = classNames[ i++ ]) ) {
- // check each className given, space seperated list
- state = isBool ? state : !jQuery(this).hasClass( className );
- jQuery(this)[ state ? "addClass" : "removeClass" ]( 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( val, state ) {
- if ( jQuery.isFunction( val ) ) {
- return this.each(function() {
- jQuery(this)[ name ]( val.call(this), state );
- });
- }
-
- return this.each( fn, arguments );
- };
-});
-
jQuery.extend({
attrFn: {
val: true,
// These attributes require special treatment
var special = rspecialurl.test( name );
- // Safari mis-reports the default selected property of a hidden option
+ // Safari mis-reports the default selected property of an option
// Accessing the parent's selectedIndex property fixes it
- if ( name === "selected" && elem.parentNode ) {
- elem.parentNode.selectedIndex;
+ 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;
+ }
+ }
}
// If applicable, access the attribute via the DOM 0 way
git.asbjorn.biz / jquery.git / blobdiff