X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fcss.js;h=ae6853e9c0ce0748920d55f0282a09b6de88af7b;hb=bca576550249e9b79b1097669dff6d4ddd0d65cf;hp=2395bdf59e3c491f49f5719eb25e918adb47ca47;hpb=0d5c3a68a092401089c9242bdafdb1b2534feb6a;p=jquery.git diff --git a/src/css.js b/src/css.js index 2395bdf..ae6853e 100644 --- a/src/css.js +++ b/src/css.js @@ -1,123 +1,98 @@ +(function( jQuery ) { + // 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/, + + cssShow = { position: "absolute", visibility: "hidden", display:"block" }, + cssWidth = [ "Left", "Right" ], + cssHeight = [ "Top", "Bottom" ], + // cache check for defaultView.getComputedStyle getComputedStyle = document.defaultView && document.defaultView.getComputedStyle, // normalize float css property - styleFloat = jQuery.support.cssFloat ? "cssFloat" : "styleFloat"; + styleFloat = jQuery.support.cssFloat ? "cssFloat" : "styleFloat", + fcamelCase = function( all, letter ) { + return letter.toUpperCase(); + }; jQuery.fn.css = function( name, value ) { - var options = name, isFunction = jQuery.isFunction( value ); - - if ( typeof name === "string" ) { - // Are we setting the style? + return jQuery.access( this, name, value, true, function( elem, name, value ) { 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 jQuery.curCSS( 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" && style.filter ) { 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 + ")"); + var opacity = parseInt( value, 10 ) + "" === "NaN" ? "" : "alpha(opacity=" + value * 100 + ")"; + var filter = style.filter || jQuery.curCSS( elem, "filter" ) || ""; + style.filter = ralpha.test(filter) ? filter.replace(ralpha, opacity) : opacity; } 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, function(all, letter){ - return letter.toUpperCase(); - }); + 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" ]; - - 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 ( name === "width" || name === "height" ) { + if ( elem.offsetWidth !== 0 ) { + val = getWH( elem, name, extra ); + + } else { + jQuery.swap( elem, cssShow, function() { + val = getWH( elem, name, extra ); }); } - if ( elem.offsetWidth !== 0 ) - getWH(); - else - jQuery.swap( elem, props, getWH ); - return Math.max(0, Math.round(val)); } @@ -129,7 +104,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) + "" : ""; @@ -139,8 +114,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 ]; @@ -148,24 +124,31 @@ jQuery.extend({ } else if ( getComputedStyle ) { // Only "float" is needed here - if ( /float/i.test( name ) ) + if ( rfloat.test( name ) ) { name = "float"; + } + + name = name.replace( rupper, "-$1" ).toLowerCase(); + + var defaultView = elem.ownerDocument.defaultView; - name = name.replace( /([A-Z])/g, "-$1" ).toLowerCase(); + if ( !defaultView ) { + return null; + } - var computedStyle = elem.ownerDocument.defaultView.getComputedStyle( elem, null ); + var computedStyle = 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, function(all, letter){ - return letter.toUpperCase(); - }); + var camelCase = name.replace(rdashAlpha, fcamelCase); ret = elem.currentStyle[ name ] || elem.currentStyle[ camelCase ]; @@ -174,13 +157,13 @@ 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; // Put in the new values to get a computed value out elem.runtimeStyle.left = elem.currentStyle.left; - style.left = ret || 0; + style.left = camelCase === "fontSize" ? "1em" : (ret || 0); ret = style.pixelLeft + "px"; // Revert the changed values @@ -195,6 +178,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 ]; @@ -204,7 +188,51 @@ jQuery.extend({ callback.call( elem ); // Revert the old values - for ( var name in options ) + for ( name in options ) { elem.style[ name ] = old[ name ]; + } } }); + +function getWH( elem, name, extra ) { + var which = name === "width" ? cssWidth : cssHeight, + val = name === "width" ? elem.offsetWidth : elem.offsetHeight; + + if ( extra === "border" ) { + return val; + } + + 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; + } + }); + + return val; +} + +if ( jQuery.expr && jQuery.expr.filters ) { + jQuery.expr.filters.hidden = function( elem ) { + var width = elem.offsetWidth, height = elem.offsetHeight, + skip = elem.nodeName.toLowerCase() === "tr"; + + return width === 0 && height === 0 && !skip ? + true : + width > 0 && height > 0 && !skip ? + false : + jQuery.curCSS(elem, "display") === "none"; + }; + + jQuery.expr.filters.visible = function( elem ) { + return !jQuery.expr.filters.hidden( elem ); + }; +} + +})( jQuery );