X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fcss.js;h=4bf818e5abeae651d2ee0c24e6f9fd6645cb7fad;hb=06c505d85194890f8bacabc66895a6167b61728a;hp=cd77ec1bd1bd3f3dfd88b5550c57f810c176f674;hpb=920099b29c1157b637f918cdc293e1c89e9cd4dc;p=jquery.git diff --git a/src/css.js b/src/css.js index cd77ec1..4bf818e 100644 --- a/src/css.js +++ b/src/css.js @@ -1,72 +1,121 @@ -// exclude the following css properties to add px -var rexclude = /z-?index|font-?weight|opacity|zoom|line-?height/i, - ralpha = /alpha\([^)]*\)/, +(function( jQuery ) { + +var ralpha = /alpha\([^)]*\)/i, 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" }, + cssShow = { position: "absolute", visibility: "hidden", display: "block" }, cssWidth = [ "Left", "Right" ], cssHeight = [ "Top", "Bottom" ], curCSS, // cache check for defaultView.getComputedStyle getComputedStyle = document.defaultView && document.defaultView.getComputedStyle, - // normalize float css property - styleFloat = jQuery.support.cssFloat ? "cssFloat" : "styleFloat", + fcamelCase = function( all, letter ) { return letter.toUpperCase(); }; jQuery.fn.css = function( name, value ) { + // Setting 'undefined' is a no-op + if ( arguments.length === 2 && value === undefined ) { + return this; + } + return jQuery.access( this, name, value, true, function( elem, name, value ) { - jQuery.css( elem, name, value ); + return value !== undefined ? + jQuery.style( elem, name, value ) : + jQuery.css( elem, name ); }); }; jQuery.extend({ - cssHooks: {}, - - css: function( elem, name, value, force, extra ) { - // don't set styles on text and comment nodes - if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 ) { - return undefined; + // Add in style property hooks for overriding the default + // behavior of getting and setting a style property + cssHooks: { + opacity: { + get: function( elem, computed ) { + if ( computed ) { + // We should always get a number back from opacity + var ret = curCSS( elem, "opacity", "opacity" ); + return ret === "" ? "1" : ret; + + } else { + return elem.style.opacity; + } + } } + }, + + // Exclude the following css properties to add px + cssNumber: { + "zIndex": true, + "fontWeight": true, + "opacity": true, + "zoom": true, + "lineHeight": true + }, + + // Add in properties whose names you wish to fix before + // setting or getting the value + cssProps: { + // normalize float css property + "float": jQuery.support.cssFloat ? "cssFloat" : "styleFloat" + }, - // Make sure we're using the right name for getting the float value - if ( rfloat.test( name ) ) { - name = styleFloat; + // Get and set the style property on a DOM Node + style: function( elem, name, value, extra ) { + // Don't set styles on text and comment nodes + if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || !elem.style ) { + return undefined; } - name = name.replace( rdashAlpha, fcamelCase ); + // Make sure that we're working with the right name + var ret, origName = jQuery.camelCase( name ), + style = elem.style, hooks = jQuery.cssHooks[ origName ]; - var ret, style = elem.style || {}, hooks = jQuery.cssHooks[name] || {}; + name = jQuery.cssProps[ origName ] || origName; + // Check if we're setting a value if ( value !== undefined ) { - if ( typeof value === "number" && !rexclude.test(name) ) { + // If a number was passed in, add 'px' to the (except for certain CSS properties) + if ( typeof value === "number" && !jQuery.cssNumber[ origName ] ) { value += "px"; } - if ( !("set" in hooks) || (value = hooks.set( elem, value )) === false ) { + // If a hook was provided, use that value, otherwise just set the specified value + if ( !hooks || !("set" in hooks) || (value = hooks.set( elem, value )) !== undefined ) { style[ name ] = value; } } else { - if ( "get" in hooks && (ret = hooks.get( elem, force, extra )) !== false ) { + // If a hook was provided get the non-computed value from there + if ( hooks && "get" in hooks && (ret = hooks.get( elem, false, extra )) !== undefined ) { return ret; } - if ( !force && name in style ) { - ret = style[ name ]; + // Otherwise just get the value from the style object + return style[ name ]; + } + }, - } else if ( curCSS ) { - ret = curCSS( elem, name ); - } + css: function( elem, name, extra ) { + // Make sure that we're working with the right name + var ret, origName = jQuery.camelCase( name ), + hooks = jQuery.cssHooks[ origName ]; + name = jQuery.cssProps[ origName ] || origName; + + // If a hook was provided get the computed value from there + if ( hooks && "get" in hooks && (ret = hooks.get( elem, true, extra )) !== undefined ) { return ret; + + // Otherwise, if a way to get the computed value exists, use that + } else if ( curCSS ) { + return curCSS( elem, name, origName ); } }, @@ -86,36 +135,58 @@ jQuery.extend({ for ( name in options ) { elem.style[ name ] = old[ name ]; } + }, + + camelCase: function( string ) { + return string.replace( rdashAlpha, fcamelCase ); } }); +// DEPRECATED, Use jQuery.css() instead +jQuery.curCSS = jQuery.css; + jQuery.each(["height", "width"], function( i, name ) { jQuery.cssHooks[ name ] = { - get: function( elem, force, extra ) { - if ( elem.offsetWidth !== 0 ) { - val = getWH( elem, name, extra ); + get: function( elem, computed, extra ) { + var val; - } else { - jQuery.swap( elem, cssShow, function() { + if ( computed ) { + if ( elem.offsetWidth !== 0 ) { val = getWH( elem, name, extra ); - }); + + } else { + jQuery.swap( elem, cssShow, function() { + val = getWH( elem, name, extra ); + }); + } + + return val + "px"; } }, set: function( elem, value ) { - // ignore negative width and height values #1599 - elem.style[ name ] = Math.max( parseFloat(value), 0 ); + if ( rnumpx.test( value ) ) { + // ignore negative width and height values #1599 + value = parseFloat(value); + + if ( value >= 0 ) { + return value + "px"; + } + + } else { + return value; + } } }; }); if ( !jQuery.support.opacity ) { jQuery.cssHooks.opacity = { - get: function( elem, force ) { + get: function( elem, computed ) { // IE uses filters for opacity - return ropacity.test(elem.currentStyle.filter || "") ? + return ropacity.test((computed && elem.currentStyle ? elem.currentStyle.filter : elem.style.filter) || "") ? (parseFloat(RegExp.$1) / 100) + "" : - "1"; + computed ? "1" : ""; }, set: function( elem, value ) { @@ -126,49 +197,38 @@ if ( !jQuery.support.opacity ) { style.zoom = 1; // Set the alpha filter to set the opacity - var opacity = parseInt( value, 10 ) + "" === "NaN" ? + var opacity = jQuery.isNaN(value) ? "" : - "alpha(opacity=" + value * 100 + ")"; - - var filter = style.filter || jQuery.css( elem, "filter" ) || ""; + "alpha(opacity=" + value * 100 + ")", + filter = style.filter || ""; style.filter = ralpha.test(filter) ? filter.replace(ralpha, opacity) : - opacity; + style.filter + ' ' + opacity; } }; } if ( getComputedStyle ) { - curCSS = function( elem, name ) { + curCSS = function( elem, newName, name ) { var ret, defaultView, computedStyle; - // Only "float" is needed here - if ( rfloat.test( name ) ) { - name = "float"; - } - name = name.replace( rupper, "-$1" ).toLowerCase(); if ( !(defaultView = elem.ownerDocument.defaultView) ) { - return null; + return undefined; } if ( (computedStyle = defaultView.getComputedStyle( elem, null )) ) { ret = computedStyle.getPropertyValue( name ); } - // We should always get a number back from opacity - if ( name === "opacity" && ret === "" ) { - ret = "1"; - } - return ret; }; } else if ( document.documentElement.currentStyle ) { curCSS = function( elem, name ) { - var left, rsLeft, ret = elem.currentStyle[ name ]; + var left, rsLeft, ret = elem.currentStyle && elem.currentStyle[ name ], style = elem.style; // From the awesome hack by Dean Edwards // http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291 @@ -204,14 +264,14 @@ function getWH( elem, name, extra ) { jQuery.each( which, function() { if ( !extra ) { - val -= parseFloat(jQuery.css( elem, "padding" + this, undefined, true)) || 0; + val -= parseFloat(jQuery.css( elem, "padding" + this )) || 0; } if ( extra === "margin" ) { - val += parseFloat(jQuery.css( elem, "margin" + this, undefined, true)) || 0; + val += parseFloat(jQuery.css( elem, "margin" + this )) || 0; } else { - val -= parseFloat(jQuery.css( elem, "border" + this + "Width", undefined, true)) || 0; + val -= parseFloat(jQuery.css( elem, "border" + this + "Width" )) || 0; } }); @@ -227,10 +287,12 @@ if ( jQuery.expr && jQuery.expr.filters ) { true : width > 0 && height > 0 && !skip ? false : - jQuery.css(elem, "display") === "none"; + (elem.style.display || jQuery.css( elem, "display" )) === "none"; }; jQuery.expr.filters.visible = function( elem ) { return !jQuery.expr.filters.hidden( elem ); }; } + +})( jQuery );