X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fcss.js;h=f47bc8e2be92847375ef0996cb64519e8e3ed6e3;hb=c7006d2fa54ee66cc0fa413aabe157a0248673e0;hp=c32034d9482ccde3aa1f1c0d0c4519c34cd7c998;hpb=f57d93bf18a2d5c3b7a0b50da67cf6147aa389c3;p=jquery.git diff --git a/src/css.js b/src/css.js index c32034d..f47bc8e 100644 --- a/src/css.js +++ b/src/css.js @@ -1,5 +1,13 @@ // exclude the following css properties to add px -var exclude = /z-?index|font-?weight|opacity|zoom|line-?height/i, +var rexclude = /z-?index|font-?weight|opacity|zoom|line-?height/i, + ralpha = /alpha\([^)]*\)/, + ropacity = /opacity=([^)]*)/, + rfloat = /float/i, + rdashAlpha = /-([a-z])/ig, + rupper = /([A-Z])/g, + rnumpx = /^\d+(?:px)?$/i, + rnum = /^\d/, + // cache check for defaultView.getComputedStyle getComputedStyle = document.defaultView && document.defaultView.getComputedStyle, // normalize float css property @@ -9,115 +17,91 @@ var exclude = /z-?index|font-?weight|opacity|zoom|line-?height/i, }; jQuery.fn.css = function( name, value ) { - var options = name, isFunction = jQuery.isFunction( value ); - - if ( typeof name === "string" ) { - // Are we setting the style? - if ( value === undefined ) { - return this.length ? - jQuery.css( this[0], name ) : - null; - - // Convert name, value params to options hash format - } else { - options = {}; - options[ name ] = value; + return access( this, name, value, true, function( elem, name, value ) { + if (value === undefined) { + return jQuery.css( elem, name ); } - } - - var isFunction = {}; - - // For each value, determine whether it's a Function so we don't - // need to determine it again for each element - for ( var prop in options ) - isFunction[prop] = jQuery.isFunction( options[prop] ); - - // For each element... - 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[prop] ) value = value.call( elem, i ); - - if ( typeof value === "number" && !exclude.test(prop) ) { - value = value + "px"; - } - - jQuery.style( elem, prop, value ); + + if ( typeof value === "number" && !rexclude.test(name) ) { + value += "px"; } - } - return this; + jQuery.style( elem, name, value ); + }); }; jQuery.extend({ style: function( elem, name, value ) { // don't set styles on text and comment nodes - if (!elem || elem.nodeType == 3 || elem.nodeType == 8) + if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 ) { return undefined; + } // ignore negative width and height values #1599 - if ( (name == 'width' || name == 'height') && parseFloat(value) < 0 ) + if ( (name === "width" || name === "height") && parseFloat(value) < 0 ) { value = undefined; + } var style = elem.style || elem, set = value !== undefined; // IE uses filters for opacity - if ( !jQuery.support.opacity && name == "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 style.zoom = 1; // Set the alpha filter to set the opacity - style.filter = (style.filter || "").replace( /alpha\([^)]*\)/, "" ) + - (parseInt( value ) + '' == "NaN" ? "" : "alpha(opacity=" + value * 100 + ")"); + style.filter = (style.filter || "").replace( ralpha, "" ) + + (parseInt( value ) + '' === "NaN" ? "" : "alpha(opacity=" + value * 100 + ")"); } return style.filter && style.filter.indexOf("opacity=") >= 0 ? - (parseFloat( /opacity=([^)]*)/.exec(style.filter)[1] ) / 100) + '': + (parseFloat( ropacity.exec(style.filter)[1] ) / 100) + '': ""; } // Make sure we're using the right name for getting the float value - if ( /float/i.test( name ) ) + if ( rfloat.test( name ) ) { name = styleFloat; + } - name = name.replace(/-([a-z])/ig, fcamelCase); + name = name.replace(rdashAlpha, fcamelCase); - if ( set ) + if ( set ) { style[ name ] = value; + } return style[ 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" ]; + 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; + val = name === "width" ? elem.offsetWidth : elem.offsetHeight; - if ( extra === "border" ) - return; + if ( extra === "border" ) { return; } jQuery.each( which, function() { - if ( !extra ) + if ( !extra ) { val -= parseFloat(jQuery.curCSS( elem, "padding" + this, true)) || 0; - if ( extra === "margin" ) + } + + if ( extra === "margin" ) { val += parseFloat(jQuery.curCSS( elem, "margin" + this, true)) || 0; - else + } else { val -= parseFloat(jQuery.curCSS( elem, "border" + this + "Width", true)) || 0; + } }); } - if ( elem.offsetWidth !== 0 ) + if ( elem.offsetWidth !== 0 ) { getWH(); - else + } else { jQuery.swap( elem, props, getWH ); + } return Math.max(0, Math.round(val)); } @@ -130,7 +114,7 @@ jQuery.extend({ // IE uses filters for opacity if ( !jQuery.support.opacity && name === "opacity" && elem.currentStyle ) { - ret = /opacity=([^)]*)/.test(elem.currentStyle.filter || "") ? + ret = ropacity.test(elem.currentStyle.filter || "") ? (parseFloat(RegExp.$1) / 100) + "" : ""; @@ -140,8 +124,9 @@ jQuery.extend({ } // Make sure we're using the right name for getting the float value - if ( /float/i.test( name ) ) + if ( rfloat.test( name ) ) { name = styleFloat; + } if ( !force && style && style[ name ] ) { ret = style[ name ]; @@ -149,22 +134,25 @@ jQuery.extend({ } else if ( getComputedStyle ) { // Only "float" is needed here - if ( /float/i.test( name ) ) + if ( rfloat.test( name ) ) { name = "float"; + } - name = name.replace( /([A-Z])/g, "-$1" ).toLowerCase(); + name = name.replace( rupper, "-$1" ).toLowerCase(); var computedStyle = elem.ownerDocument.defaultView.getComputedStyle( elem, null ); - if ( computedStyle ) + if ( computedStyle ) { ret = computedStyle.getPropertyValue( name ); + } // We should always get a number back from opacity - if ( name == "opacity" && ret == "" ) + if ( name === "opacity" && ret === "" ) { ret = "1"; + } } else if ( elem.currentStyle ) { - var camelCase = name.replace(/\-(\w)/g, fcamelCase); + var camelCase = name.replace(rdashAlpha, fcamelCase); ret = elem.currentStyle[ name ] || elem.currentStyle[ camelCase ]; @@ -173,7 +161,7 @@ jQuery.extend({ // 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 ) ) { + if ( !rnumpx.test( ret ) && rnum.test( ret ) ) { // Remember the original values var left = style.left, rsLeft = elem.runtimeStyle.left; @@ -194,6 +182,7 @@ 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 ]; @@ -203,7 +192,8 @@ jQuery.extend({ callback.call( elem ); // Revert the old values - for ( var name in options ) + for ( var name in options ) { elem.style[ name ] = old[ name ]; + } } });