X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fattributes.js;h=9e66df0ce99b14183688eeedbdaba72e7484fce8;hb=89dc1e01435ebeef173c9a843096cd5c1fbc9dd8;hp=8d5c2229cd914b8bdf3169f9b140574cd1dbad07;hpb=7c04a64016c1f295dfdf4e731f693f8400a987bc;p=jquery.git diff --git a/src/attributes.js b/src/attributes.js index 8d5c222..9e66df0 100644 --- a/src/attributes.js +++ b/src/attributes.js @@ -1,50 +1,36 @@ jQuery.fn.extend({ - attr: function( name, value, type ) { - var options = name, isFunction = jQuery.isFunction( value ); + attr: function( name, value ) { + var elem, options, isFunction = jQuery.isFunction(value); - // Look for the case where we're accessing a style value - if ( typeof name === "string" ) { - if ( value === undefined ) { + if ( typeof name === "string" ) { // A single attribute + if ( value === undefined ) { // Query it on first element return this.length ? - jQuery[ type || "attr" ]( this[0], name ) : + jQuery.attr( this[0], name ) : null; - - } else { - options = {}; - options[ name ] = value; - } - } - - // Check to see if we're setting style values - for ( var i = 0, l = this.length; i < l; i++ ) { - var elem = this[i]; - - // Set all the styles - for ( var prop in options ) { - value = options[prop]; - - if ( isFunction ) { - value = value.call( elem, i ); + } 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 ); } - - if ( typeof value === "number" && type === "curCSS" && !exclude.test(prop) ) { - value = value + "px"; + } + } 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( 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 ); }, @@ -56,7 +42,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, @@ -85,7 +71,7 @@ jQuery.fn.extend({ } } - return values; + return values; } // Everything else, we just grab the value @@ -96,19 +82,29 @@ 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, val) >= 0 || + jQuery.inArray(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 || @@ -119,7 +115,7 @@ jQuery.fn.extend({ this.selectedIndex = -1; } else - this.value = value; + this.value = val; }); } }); @@ -140,9 +136,24 @@ jQuery.each({ }, 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(){ @@ -176,119 +187,6 @@ jQuery.extend({ } }, - // 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) @@ -302,7 +200,6 @@ 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 ) { // These attributes require special treatment @@ -343,8 +240,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 @@ -360,31 +261,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 +});