X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fattributes.js;h=0edf21886f8c75c60f46911f5ceba91671ec1729;hb=70b9aed422c34047299fe6e8934902fae61f2a3e;hp=04562ff8b0711100f555a33422d3d75ef10db13a;hpb=5e6e53835e552920db4f88ac0c9eca71aaacbef0;p=jquery.git diff --git a/src/attributes.js b/src/attributes.js index 04562ff..0edf218 100644 --- a/src/attributes.js +++ b/src/attributes.js @@ -1,34 +1,51 @@ jQuery.fn.extend({ attr: function( name, value ) { - var options = name, isFunction = jQuery.isFunction( value ); - - if ( typeof name === "string" ) { - // Are we setting the attribute? - if ( value === undefined ) { - return this.length ? - jQuery.attr( this[0], name ) : - null; - - // Convert name, value params to options hash format - } else { - options = {}; - options[ name ] = value; + return access(this, name, value, true, jQuery.attr); + }, + + addClass: function( 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; + }, - // Set all the attributes - for ( var prop in options ) { - value = options[prop]; + removeClass: function( value ) { + 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 + " "; + 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 = ""; + } + } } } @@ -36,7 +53,14 @@ jQuery.fn.extend({ }, 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 + " ").indexOf( className ) > -1 ) { + return true; + } + } + + return false; }, val: function( value ) { @@ -86,30 +110,38 @@ jQuery.fn.extend({ 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; }); } }); @@ -121,14 +153,6 @@ jQuery.each({ this.removeAttribute( name ); }, - addClass: function( classNames ) { - jQuery.className.add( this, classNames ); - }, - - removeClass: function( classNames ) { - jQuery.className.remove( this, classNames ); - }, - toggleClass: function( classNames, state ) { var type = typeof classNames; if ( type === "string" ) { @@ -137,17 +161,16 @@ jQuery.each({ 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" ) { - // toggle whole className - if ( this.className || classNames === false ) { + if ( this.className ) { + // store className if set jQuery.data( this, "__className__", this.className ); - this.className = ""; - } else { - this.className = jQuery.data( this, "__className__" ) || ""; } + // toggle whole className + this.className = this.className || classNames === false ? "" : jQuery.data( this, "__className__" ) || ""; } } }, function(name, fn){ @@ -157,37 +180,16 @@ jQuery.each({ }); 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; - } - }, - attr: function( elem, name, value ) { // don't set attributes on text and comment nodes if (!elem || elem.nodeType == 3 || elem.nodeType == 8) return undefined; - var notxml = !elem.tagName || !jQuery.isXMLDoc( elem ), + if ( name in jQuery.fn && name !== "attr" ) { + return jQuery(elem)[name](value); + } + + var notxml = elem.nodeType !== 1 || !jQuery.isXMLDoc( elem ), // Whether we are setting (or getting) set = value !== undefined; @@ -195,7 +197,7 @@ jQuery.extend({ 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 ); @@ -209,7 +211,7 @@ jQuery.extend({ 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; @@ -225,9 +227,9 @@ jQuery.extend({ 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; } @@ -259,4 +261,4 @@ jQuery.extend({ // Using attr for specific style information is now deprecated. Use style insead. return jQuery.style(elem, name, value); } -}); \ No newline at end of file +});