X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fcss.js;h=5d50d32f367f10bbc694112a1014bd89ba7d684c;hb=2912f8ab9520e042e8b27865617e586e34a05704;hp=42d038a2297d1041abe4d2627ae4cdc97290939f;hpb=a18f682012ae8e63f3b43b39375b3c5ce0a561e3;p=jquery.git diff --git a/src/css.js b/src/css.js index 42d038a..5d50d32 100644 --- a/src/css.js +++ b/src/css.js @@ -11,6 +11,7 @@ var rexclude = /z-?index|font-?weight|opacity|zoom|line-?height/i, 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, @@ -21,11 +22,11 @@ var rexclude = /z-?index|font-?weight|opacity|zoom|line-?height/i, }; jQuery.fn.css = function( name, value ) { - return access( this, name, value, true, function( elem, name, value ) { + return jQuery.access( this, name, value, true, function( elem, name, value ) { if ( value === undefined ) { return jQuery.curCSS( elem, name ); } - + if ( typeof value === "number" && !rexclude.test(name) ) { value += "px"; } @@ -35,6 +36,8 @@ jQuery.fn.css = function( name, value ) { }; jQuery.extend({ + cssHooks: {}, + style: function( elem, name, value ) { // don't set styles on text and comment nodes if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 ) { @@ -48,24 +51,6 @@ jQuery.extend({ var style = elem.style || elem, set = value !== undefined; - // 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 - style.zoom = 1; - - // Set the alpha filter to set the opacity - 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( ropacity.exec(style.filter)[1] ) / 100) + "": - ""; - } - // Make sure we're using the right name for getting the float value if ( rfloat.test( name ) ) { name = styleFloat; @@ -73,10 +58,19 @@ jQuery.extend({ name = name.replace(rdashAlpha, fcamelCase); - if ( set ) { + var hooks = jQuery.cssHooks[name] || {}; + + if ( set && (!("set" in hooks) || hooks.set( elem, value ) === false) ) { style[ name ] = value; } + if ( "get" in hooks ) { + var cssHookReturn = hooks.get( elem, false ); + if ( cssHookReturn !== false ) { + return cssHookReturn; + } + } + return style[ name ]; }, @@ -98,76 +92,22 @@ jQuery.extend({ }, curCSS: function( elem, name, force ) { - var ret, style = elem.style, filter; - - // IE uses filters for opacity - if ( !jQuery.support.opacity && name === "opacity" && elem.currentStyle ) { - ret = ropacity.test(elem.currentStyle.filter || "") ? - (parseFloat(RegExp.$1) / 100) + "" : - ""; - - return ret === "" ? - "1" : - ret; - } + var ret, style = elem.style || {}, hooks = jQuery.cssHooks[name] || {}; // Make sure we're using the right name for getting the float value if ( rfloat.test( name ) ) { name = styleFloat; } - if ( !force && style && style[ name ] ) { - ret = style[ name ]; - - } else if ( getComputedStyle ) { - - // Only "float" is needed here - if ( rfloat.test( name ) ) { - name = "float"; - } - - name = name.replace( rupper, "-$1" ).toLowerCase(); - - var defaultView = elem.ownerDocument.defaultView; - - if ( !defaultView ) { - return null; - } - - 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(rdashAlpha, fcamelCase); - - 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 ( !rnumpx.test( ret ) && rnum.test( ret ) ) { - // Remember the original values - var left = style.left, rsLeft = elem.runtimeStyle.left; + if ( "get" in hooks && (ret = hooks.get( elem, force )) !== false ) { + return ret; + } - // Put in the new values to get a computed value out - elem.runtimeStyle.left = elem.currentStyle.left; - style.left = camelCase === "fontSize" ? "1em" : (ret || 0); - ret = style.pixelLeft + "px"; + if ( !force && name in style ) { + ret = style[ name ]; - // Revert the changed values - style.left = left; - elem.runtimeStyle.left = rsLeft; - } + } else if ( curCSS ) { + ret = curCSS( elem, name ); } return ret; @@ -186,12 +126,98 @@ jQuery.extend({ callback.call( elem ); // Revert the old values - for ( var name in options ) { + for ( name in options ) { elem.style[ name ] = old[ name ]; } } }); +if ( !jQuery.support.opacity ) { + jQuery.cssHooks.opacity = { + get: function( elem, force ) { + // IE uses filters for opacity + return ropacity.test(elem.currentStyle.filter || "") ? + (parseFloat(RegExp.$1) / 100) + "" : + "1"; + }, + + set: function( elem, value ) { + var style = elem.style; + + // 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 + 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; + } + }; +} + +if ( getComputedStyle ) { + curCSS = function( elem, 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; + } + + 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, camelCase = name.replace(rdashAlpha, fcamelCase), + 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 ( !rnumpx.test( ret ) && rnum.test( ret ) ) { + // Remember the original values + 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 = camelCase === "fontSize" ? "1em" : (ret || 0); + ret = style.pixelLeft + "px"; + + // Revert the changed values + style.left = left; + elem.runtimeStyle.left = rsLeft; + } + + return ret; + }; +} + function getWH( elem, name, extra ) { var which = name === "width" ? cssWidth : cssHeight, val = name === "width" ? elem.offsetWidth : elem.offsetHeight;