X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fattributes.js;h=0edf21886f8c75c60f46911f5ceba91671ec1729;hb=c7006d2fa54ee66cc0fa413aabe157a0248673e0;hp=7690c81176ecfae10c354cfca61810a6641da80f;hpb=9476530fa1e39ce1324e98f4dbb79576895372e5;p=jquery.git diff --git a/src/attributes.js b/src/attributes.js index 7690c81..0edf218 100644 --- a/src/attributes.js +++ b/src/attributes.js @@ -1,57 +1,66 @@ -// exclude the following css properties to add px -var exclude = /z-?index|font-?weight|opacity|zoom|line-?height/i, - // cache defaultView - defaultView = document.defaultView || {}; - jQuery.fn.extend({ - attr: function( name, value, type ) { - var options = name, isFunction = jQuery.isFunction( value ); - - // Look for the case where we're accessing a style value - if ( typeof name === "string" ) { - if ( value === undefined ) { - return this.length ? - jQuery[ type || "attr" ]( this[0], name ) : - null; - - } else { - options = {}; - options[ name ] = value; + attr: function( 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]; + } + } + } + } } } - // Check to see if we're setting style values - for ( var i = 0, l = this.length; i < l; i++ ) { - var elem = this[i]; + return this; + }, - // Set all the styles - 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]; - if ( typeof value === "number" && type === "curCSS" && !exclude.test(prop) ) { - value = value + "px"; + 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 = ""; + } } - - jQuery.attr( type ? elem.style : elem, prop, value ); } } return this; }, - css: function( key, value ) { - // ignore negative width and height values - if ( (key == 'width' || key == 'height') && parseFloat(value) < 0 ) - value = undefined; - return this.attr( key, value, "curCSS" ); - }, - 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 ) { @@ -61,7 +70,7 @@ jQuery.fn.extend({ if ( elem ) { 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, @@ -90,7 +99,7 @@ jQuery.fn.extend({ } } - return values; + return values; } // Everything else, we just grab the value @@ -101,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; }); } }); @@ -136,18 +153,25 @@ 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 ) { - 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(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(){ @@ -156,150 +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; - } - }, - - // A method for quickly swapping in/out CSS properties to get correct calculations - swap: function( elem, options, callback ) { - var old = {}; - // Remember the old values, and insert the new ones - for ( var name in options ) { - old[ name ] = elem.style[ name ]; - elem.style[ name ] = options[ name ]; - } - - callback.call( elem ); - - // Revert the old values - for ( var name in options ) - elem.style[ name ] = old[ name ]; - }, - - css: function( elem, name, force, extra ) { - if ( name == "width" || name == "height" ) { - var val, props = { position: "absolute", visibility: "hidden", display:"block" }, which = name == "width" ? [ "Left", "Right" ] : [ "Top", "Bottom" ]; - - function getWH() { - val = name == "width" ? elem.offsetWidth : elem.offsetHeight; - - if ( extra === "border" ) - return; - - jQuery.each( which, function() { - if ( !extra ) - val -= parseFloat(jQuery.curCSS( elem, "padding" + this, true)) || 0; - if ( extra === "margin" ) - val += parseFloat(jQuery.curCSS( elem, "margin" + this, true)) || 0; - else - val -= parseFloat(jQuery.curCSS( elem, "border" + this + "Width", true)) || 0; - }); - } - - if ( elem.offsetWidth !== 0 ) - getWH(); - else - jQuery.swap( elem, props, getWH ); - - return Math.max(0, Math.round(val)); - } - - return jQuery.curCSS( elem, name, force ); - }, - - curCSS: function( elem, name, force ) { - var ret, style = elem.style; - - // We need to handle opacity special in IE - if ( name == "opacity" && !jQuery.support.opacity ) { - ret = jQuery.attr( style, "opacity" ); - - return ret == "" ? - "1" : - ret; - } - - // Make sure we're using the right name for getting the float value - if ( name.match( /float/i ) ) - name = styleFloat; - - if ( !force && style && style[ name ] ) - ret = style[ name ]; - - else if ( defaultView.getComputedStyle ) { - - // Only "float" is needed here - if ( name.match( /float/i ) ) - name = "float"; - - name = name.replace( /([A-Z])/g, "-$1" ).toLowerCase(); - - var computedStyle = defaultView.getComputedStyle( elem, null ); - - if ( computedStyle ) - ret = computedStyle.getPropertyValue( name ); - - // We should always get a number back from opacity - if ( name == "opacity" && ret == "" ) - ret = "1"; - - } else if ( elem.currentStyle ) { - var camelCase = name.replace(/\-(\w)/g, function(all, letter){ - return letter.toUpperCase(); - }); - - ret = elem.currentStyle[ name ] || elem.currentStyle[ camelCase ]; - - // From the awesome hack by Dean Edwards - // http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291 - - // If we're not dealing with a regular pixel number - // but a number that has a weird ending, we need to convert it to pixels - if ( !/^\d+(px)?$/i.test( ret ) && /^\d/.test( ret ) ) { - // Remember the original values - var left = style.left, rsLeft = elem.runtimeStyle.left; - - // Put in the new values to get a computed value out - elem.runtimeStyle.left = elem.currentStyle.left; - style.left = ret || 0; - ret = style.pixelLeft + "px"; - - // Revert the changed values - style.left = left; - elem.runtimeStyle.left = rsLeft; - } - } - - return ret; - }, - 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; @@ -307,8 +197,7 @@ jQuery.extend({ name = notxml && jQuery.props[ name ] || name; // Only do all the following if this is a node (faster for style) - // IE elem.getAttribute passes even for style - if ( elem.tagName ) { + if ( elem.nodeType === 1 ) { // These attributes require special treatment var special = /href|src|style/.test( name ); @@ -322,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; @@ -338,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; } @@ -348,8 +237,12 @@ jQuery.extend({ return elem[ name ]; } - if ( !jQuery.support.style && notxml && name == "style" ) - return jQuery.attr( elem.style, "cssText", value ); + 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 @@ -365,31 +258,7 @@ jQuery.extend({ } // elem is actually elem.style ... set the style - - // IE uses filters for opacity - if ( !jQuery.support.opacity && name == "opacity" ) { - if ( set ) { - // IE has trouble with opacity if it does not have layout - // Force it by setting the zoom level - elem.zoom = 1; - - // Set the alpha filter to set the opacity - elem.filter = (elem.filter || "").replace( /alpha\([^)]*\)/, "" ) + - (parseInt( value ) + '' == "NaN" ? "" : "alpha(opacity=" + value * 100 + ")"); - } - - return elem.filter && elem.filter.indexOf("opacity=") >= 0 ? - (parseFloat( elem.filter.match(/opacity=([^)]*)/)[1] ) / 100) + '': - ""; - } - - name = name.replace(/-([a-z])/ig, function(all, letter){ - return letter.toUpperCase(); - }); - - if ( set ) - elem[ name ] = value; - - return elem[ name ]; + // Using attr for specific style information is now deprecated. Use style insead. + return jQuery.style(elem, name, value); } -}); \ No newline at end of file +});