From: John Resig Date: Fri, 17 Sep 2010 18:32:43 +0000 (-0400) Subject: Merge branch 'csshooks' X-Git-Url: http://git.asbjorn.it/?a=commitdiff_plain;h=51d258074cf4cbb6e8c57361c421494220a65cb1;hp=fc5b69fc706a6025e5084d4b86adb3b97840c84f;p=jquery.git Merge branch 'csshooks' --- diff --git a/src/attributes.js b/src/attributes.js index 73b4cdf..4fa49b9 100644 --- a/src/attributes.js +++ b/src/attributes.js @@ -341,10 +341,6 @@ jQuery.extend({ // Non-existent attributes return null, we normalize to undefined return attr === null ? undefined : attr; } - - // elem is actually elem.style ... set the style - // Using attr for specific style information is now deprecated. Use style instead. - return jQuery.style( elem, name, value ); } }); diff --git a/src/css.js b/src/css.js index ae6853e..9113be2 100644 --- a/src/css.js +++ b/src/css.js @@ -1,198 +1,244 @@ (function( jQuery ) { -// exclude the following css properties to add px -var rexclude = /z-?index|font-?weight|opacity|zoom|line-?height/i, - ralpha = /alpha\([^)]*\)/, +var 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" }, + 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 ) { 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"; - } - - jQuery.style( elem, name, value ); + return jQuery.css( 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 ) { - return undefined; + // Add in style property hooks for overriding the default + // behavior of getting and setting a style property + cssHooks: { + opacity: { + get: function( elem ) { + // We should always get a number back from opacity + var ret = curCSS( elem, "opacity", "opacity" ); + return ret === "" ? "1" : ret; + } } + }, + + // 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" + }, - // ignore negative width and height values #1599 - if ( (name === "width" || name === "height") && parseFloat(value) < 0 ) { - value = undefined; + // 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; } - var style = elem.style || elem, set = value !== undefined; + // Make sure that we're working with the right name + var ret, origName = name.replace( rdashAlpha, fcamelCase ), + style = elem.style, hooks = jQuery.cssHooks[ origName ]; - // IE uses filters for 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; + name = jQuery.cssProps[ origName ] || origName; - // 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; + // Check if we're setting a value + if ( value !== undefined ) { + // If a number was passed in, add 'px' to the (except for certain CSS properties) + if ( typeof value === "number" && !jQuery.cssNumber[ origName ] ) { + value += "px"; } - 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; - } + // 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; + } - name = name.replace(rdashAlpha, fcamelCase); + } else { + // 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 ( set ) { - style[ name ] = value; + // Otherwise just get the value from the style object + return style[ name ]; } - - return style[ name ]; }, - css: function( elem, name, force, extra ) { - if ( name === "width" || name === "height" ) { - if ( elem.offsetWidth !== 0 ) { - val = getWH( elem, name, extra ); + css: function( elem, name, value, extra ) { + // Make sure that we're working with the right name + var ret, origName = name.replace( rdashAlpha, fcamelCase ), + hooks = jQuery.cssHooks[ origName ]; - } else { - jQuery.swap( elem, cssShow, function() { - val = getWH( elem, name, extra ); - }); - } + name = jQuery.cssProps[ origName ] || origName; - return Math.max(0, Math.round(val)); - } + // Check if we're setting a value, just use jQuery.style (DEPRECATED) + if ( value !== undefined ) { + jQuery.style( elem, name, value ); - return jQuery.curCSS( elem, name, force ); - }, + // If a hook was provided get the computed value from there + } else if ( hooks && "get" in hooks && (ret = hooks.get( elem, true, extra )) !== undefined ) { + return ret; - curCSS: function( elem, name, force ) { - var ret, style = elem.style, filter; + // Otherwise, if a way to get the computed value exists, use that + } else if ( curCSS ) { + return curCSS( elem, name, origName ); + } + }, - // IE uses filters for opacity - if ( !jQuery.support.opacity && name === "opacity" && elem.currentStyle ) { - ret = ropacity.test(elem.currentStyle.filter || "") ? - (parseFloat(RegExp.$1) / 100) + "" : - ""; + // A method for quickly swapping in/out CSS properties to get correct calculations + swap: function( elem, options, callback ) { + var old = {}; - return ret === "" ? - "1" : - ret; + // Remember the old values, and insert the new ones + for ( var name in options ) { + old[ name ] = elem.style[ name ]; + elem.style[ name ] = options[ name ]; } - // Make sure we're using the right name for getting the float value - if ( rfloat.test( name ) ) { - name = styleFloat; + callback.call( elem ); + + // Revert the old values + for ( name in options ) { + elem.style[ name ] = old[ name ]; } + } +}); - if ( !force && style && style[ name ] ) { - ret = style[ name ]; +jQuery.each(["height", "width"], function( i, name ) { + jQuery.cssHooks[ name ] = { + get: function( elem, computed, extra ) { + var val; - } else if ( getComputedStyle ) { + if ( computed ) { + if ( elem.offsetWidth !== 0 ) { + val = getWH( elem, name, extra ); - // Only "float" is needed here - if ( rfloat.test( name ) ) { - name = "float"; + } else { + jQuery.swap( elem, cssShow, function() { + val = getWH( elem, name, extra ); + }); + } + + return val + "px"; } + }, - name = name.replace( rupper, "-$1" ).toLowerCase(); + set: function( elem, value ) { + if ( value !== "" ) { + // ignore negative width and height values #1599 + value = parseFloat(value); - var defaultView = elem.ownerDocument.defaultView; + if ( value >= 0 ) { + return value + "px"; + } - if ( !defaultView ) { - return null; + } else { + return value; } + } + }; +}); - var computedStyle = defaultView.getComputedStyle( elem, null ); +if ( !jQuery.support.opacity ) { + jQuery.cssHooks.opacity = { + get: function( elem, computed ) { + // IE uses filters for opacity + return ropacity.test((computed ? elem.currentStyle.filter : elem.style.filter) || "") ? + (parseFloat(RegExp.$1) / 100) + "" : + "1"; + }, - if ( computedStyle ) { - ret = computedStyle.getPropertyValue( name ); - } + set: function( elem, value ) { + var style = elem.style; - // We should always get a number back from opacity - if ( name === "opacity" && ret === "" ) { - ret = "1"; - } + // IE has trouble with opacity if it does not have layout + // Force it by setting the zoom level + style.zoom = 1; - } else if ( elem.currentStyle ) { - var camelCase = name.replace(rdashAlpha, fcamelCase); + // Set the alpha filter to set the opacity + var opacity = parseInt( value, 10 ) + "" === "NaN" ? + "" : + "alpha(opacity=" + value * 100 + ")"; - ret = elem.currentStyle[ name ] || elem.currentStyle[ camelCase ]; + var filter = style.filter || elem.currentStyle.filter || ""; - // From the awesome hack by Dean Edwards - // http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291 + style.filter = ralpha.test(filter) ? + filter.replace(ralpha, opacity) : + opacity; + } + }; +} - // 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 ( getComputedStyle ) { + curCSS = function( elem, newName, name ) { + var ret, defaultView, computedStyle; - // 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"; + name = name.replace( rupper, "-$1" ).toLowerCase(); - // Revert the changed values - style.left = left; - elem.runtimeStyle.left = rsLeft; - } + if ( !(defaultView = elem.ownerDocument.defaultView) ) { + return undefined; + } + + if ( (computedStyle = defaultView.getComputedStyle( elem, null )) ) { + ret = computedStyle.getPropertyValue( name ); } return ret; - }, + }; - // A method for quickly swapping in/out CSS properties to get correct calculations - swap: function( elem, options, callback ) { - var old = {}; +} else if ( document.documentElement.currentStyle ) { + curCSS = function( elem, name ) { + var left, rsLeft, ret = elem.currentStyle[ name ], style = elem.style; - // Remember the old values, and insert the new ones - for ( var name in options ) { - old[ name ] = elem.style[ name ]; - elem.style[ name ] = options[ name ]; - } + // From the awesome hack by Dean Edwards + // http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291 - callback.call( elem ); + // 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; - // Revert the old values - for ( name in options ) { - elem.style[ name ] = old[ name ]; + // Put in the new values to get a computed value out + elem.runtimeStyle.left = elem.currentStyle.left; + style.left = name === "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, @@ -204,14 +250,14 @@ function getWH( elem, name, extra ) { jQuery.each( which, function() { if ( !extra ) { - val -= parseFloat(jQuery.curCSS( elem, "padding" + this, true)) || 0; + val -= parseFloat(jQuery.css( elem, "padding" + this )) || 0; } if ( extra === "margin" ) { - val += parseFloat(jQuery.curCSS( elem, "margin" + this, true)) || 0; + val += parseFloat(jQuery.css( elem, "margin" + this )) || 0; } else { - val -= parseFloat(jQuery.curCSS( elem, "border" + this + "Width", true)) || 0; + val -= parseFloat(jQuery.css( elem, "border" + this + "Width" )) || 0; } }); @@ -227,7 +273,7 @@ if ( jQuery.expr && jQuery.expr.filters ) { true : width > 0 && height > 0 && !skip ? false : - jQuery.curCSS(elem, "display") === "none"; + (elem.style.display || jQuery.css( elem, "display" )) === "none"; }; jQuery.expr.filters.visible = function( elem ) { diff --git a/src/dimensions.js b/src/dimensions.js index de10832..698f5f4 100644 --- a/src/dimensions.js +++ b/src/dimensions.js @@ -8,14 +8,14 @@ jQuery.each([ "Height", "Width" ], function( i, name ) { // innerHeight and innerWidth jQuery.fn["inner" + name] = function() { return this[0] ? - jQuery.css( this[0], type, false, "padding" ) : + parseFloat( jQuery.css( this[0], type, undefined, "padding" ), 10 ) : null; }; // outerHeight and outerWidth jQuery.fn["outer" + name] = function( margin ) { return this[0] ? - jQuery.css( this[0], type, false, margin ? "margin" : "border" ) : + parseFloat( jQuery.css( this[0], type, undefined, margin ? "margin" : "border" ), 10 ) : null; }; @@ -50,7 +50,7 @@ jQuery.each([ "Height", "Width" ], function( i, name ) { // Get or set width or height on the element size === undefined ? // Get width or height on the element - jQuery.css( elem, type ) : + parseFloat( jQuery.css( elem, type ), 10 ) : // Set the width or height on the element (default to pixels if value is unitless) this.css( type, typeof size === "string" ? size : size + "px" ); diff --git a/src/effects.js b/src/effects.js index 73d94ef..9c8abe5 100644 --- a/src/effects.js +++ b/src/effects.js @@ -29,7 +29,7 @@ jQuery.fn.extend({ this[i].style.display = old || ""; - if ( jQuery.css(this[i], "display") === "none" ) { + if ( jQuery.css( this[i], "display" ) === "none" ) { var nodeName = this[i].nodeName, display; if ( elemdisplay[ nodeName ] ) { @@ -71,7 +71,7 @@ jQuery.fn.extend({ for ( var i = 0, l = this.length; i < l; i++ ) { var old = jQuery.data(this[i], "olddisplay"); if ( !old && old !== "none" ) { - jQuery.data(this[i], "olddisplay", jQuery.css(this[i], "display")); + jQuery.data( this[i], "olddisplay", jQuery.css( this[i], "display" ) ); } } @@ -139,7 +139,7 @@ jQuery.fn.extend({ if ( ( p === "height" || p === "width" ) && this.style ) { // Store display property - opt.display = jQuery.css(this, "display"); + opt.display = this.style.display; // Make sure that nothing sneaks out opt.overflow = this.style.overflow; @@ -316,13 +316,13 @@ jQuery.fx.prototype = { }, // Get the current size - cur: function( force ) { + cur: function() { if ( this.elem[this.prop] != null && (!this.elem.style || this.elem.style[this.prop] == null) ) { return this.elem[ this.prop ]; } - var r = parseFloat(jQuery.css(this.elem, this.prop, force)); - return r && r > -10000 ? r : parseFloat(jQuery.curCSS(this.elem, this.prop)) || 0; + var r = parseFloat( jQuery.css( this.elem, this.prop ), 10 ); + return r && r > -10000 ? r : 0; }, // Start an animation from one number to another @@ -397,7 +397,7 @@ jQuery.fx.prototype = { var old = jQuery.data(this.elem, "olddisplay"); this.elem.style.display = old ? old : this.options.display; - if ( jQuery.css(this.elem, "display") === "none" ) { + if ( jQuery.css( this.elem, "display" ) === "none" ) { this.elem.style.display = "block"; } } @@ -410,7 +410,7 @@ jQuery.fx.prototype = { // Reset the properties, if the item has been hidden or shown if ( this.options.hide || this.options.show ) { for ( var p in this.options.curAnim ) { - jQuery.style(this.elem, p, this.options.orig[p]); + jQuery.style( this.elem, p, this.options.orig[p] ); } } @@ -467,7 +467,7 @@ jQuery.extend( jQuery.fx, { step: { opacity: function( fx ) { - jQuery.style(fx.elem, "opacity", fx.now); + jQuery.style( fx.elem, "opacity", fx.now ); }, _default: function( fx ) { diff --git a/src/offset.js b/src/offset.js index c38a7f2..c472f98 100644 --- a/src/offset.js +++ b/src/offset.js @@ -105,7 +105,7 @@ if ( "getBoundingClientRect" in document.documentElement ) { jQuery.offset = { initialize: function() { - var body = document.body, container = document.createElement("div"), innerDiv, checkDiv, table, td, bodyMarginTop = parseFloat( jQuery.curCSS(body, "marginTop", true) ) || 0, + var body = document.body, container = document.createElement("div"), innerDiv, checkDiv, table, td, bodyMarginTop = parseFloat( jQuery.css(body, "marginTop") ) || 0, html = "
"; jQuery.extend( container.style, { position: "absolute", top: 0, left: 0, margin: 0, border: 0, width: "1px", height: "1px", visibility: "hidden" } ); @@ -144,25 +144,25 @@ jQuery.offset = { jQuery.offset.initialize(); if ( jQuery.offset.doesNotIncludeMarginInBodyOffset ) { - top += parseFloat( jQuery.curCSS(body, "marginTop", true) ) || 0; - left += parseFloat( jQuery.curCSS(body, "marginLeft", true) ) || 0; + top += parseFloat( jQuery.css(body, "marginTop") ) || 0; + left += parseFloat( jQuery.css(body, "marginLeft") ) || 0; } return { top: top, left: left }; }, setOffset: function( elem, options, i ) { - var position = jQuery.curCSS( elem, "position" ); + var position = jQuery.css( elem, "position" ); // set position first, in-case top/left are set even on static elem if ( position === "static" ) { elem.style.position = "relative"; } - var curElem = jQuery( elem ), - curOffset = curElem.offset(), - curCSSTop = jQuery.curCSS( elem, "top", true ), - curCSSLeft = jQuery.curCSS( elem, "left", true ), + var curElem = jQuery( elem ), + curOffset = curElem.offset(), + curCSSTop = jQuery.css( elem, "top" ), + curCSSLeft = jQuery.css( elem, "left" ), calculatePosition = (position === "absolute" && jQuery.inArray('auto', [curCSSTop, curCSSLeft]) > -1), props = {}, curPosition = {}, curTop, curLeft; @@ -212,12 +212,12 @@ jQuery.fn.extend({ // Subtract element margins // note: when an element has margin: auto the offsetLeft and marginLeft // are the same in Safari causing offset.left to incorrectly be 0 - offset.top -= parseFloat( jQuery.curCSS(elem, "marginTop", true) ) || 0; - offset.left -= parseFloat( jQuery.curCSS(elem, "marginLeft", true) ) || 0; + offset.top -= parseFloat( jQuery.css(elem, "marginTop") ) || 0; + offset.left -= parseFloat( jQuery.css(elem, "marginLeft") ) || 0; // Add offsetParent borders - parentOffset.top += parseFloat( jQuery.curCSS(offsetParent[0], "borderTopWidth", true) ) || 0; - parentOffset.left += parseFloat( jQuery.curCSS(offsetParent[0], "borderLeftWidth", true) ) || 0; + parentOffset.top += parseFloat( jQuery.css(offsetParent[0], "borderTopWidth") ) || 0; + parentOffset.left += parseFloat( jQuery.css(offsetParent[0], "borderLeftWidth") ) || 0; // Subtract the two offsets return { diff --git a/src/support.js b/src/support.js index 75e89dd..febff15 100644 --- a/src/support.js +++ b/src/support.js @@ -134,7 +134,7 @@ // release memory in IE root = script = div = all = a = null; -})(); +})( jQuery ); jQuery.props = { "for": "htmlFor", diff --git a/test/unit/css.js b/test/unit/css.js index 5f8a74a..99bab1f 100644 --- a/test/unit/css.js +++ b/test/unit/css.js @@ -1,7 +1,7 @@ module("css"); test("css(String|Hash)", function() { - expect(30); + expect(28); equals( jQuery('#main').css("display"), 'none', 'Check for css property "display"'); @@ -19,10 +19,6 @@ test("css(String|Hash)", function() { equals( parseFloat(jQuery('#nothiddendiv').css('width')), width, 'Test negative width ignored') equals( parseFloat(jQuery('#nothiddendiv').css('height')), height, 'Test negative height ignored') - jQuery('#floatTest').css({styleFloat: 'right'}); - equals( jQuery('#floatTest').css('styleFloat'), 'right', 'Modified CSS float using "styleFloat": Assert float is right'); - jQuery('#floatTest').css({cssFloat: 'left'}); - equals( jQuery('#floatTest').css('cssFloat'), 'left', 'Modified CSS float using "cssFloat": Assert float is left'); jQuery('#floatTest').css({'float': 'right'}); equals( jQuery('#floatTest').css('float'), 'right', 'Modified CSS float using "float": Assert float is right'); jQuery('#floatTest').css({'font-size': '30px'}); @@ -65,7 +61,7 @@ test("css(String|Hash)", function() { }); test("css(String, Object)", function() { - expect(21); + expect(19); ok( jQuery('#nothiddendiv').is(':visible'), 'Modifying CSS display: Assert element is visible'); jQuery('#nothiddendiv').css("display", 'none'); ok( !jQuery('#nothiddendiv').is(':visible'), 'Modified CSS display: Assert element is hidden'); @@ -75,10 +71,6 @@ test("css(String, Object)", function() { jQuery("#nothiddendiv").css("top", "-1em"); ok( jQuery("#nothiddendiv").css("top"), -16, "Check negative number in EMs." ); - jQuery('#floatTest').css('styleFloat', 'left'); - equals( jQuery('#floatTest').css('styleFloat'), 'left', 'Modified CSS float using "styleFloat": Assert float is left'); - jQuery('#floatTest').css('cssFloat', 'right'); - equals( jQuery('#floatTest').css('cssFloat'), 'right', 'Modified CSS float using "cssFloat": Assert float is right'); jQuery('#floatTest').css('float', 'left'); equals( jQuery('#floatTest').css('float'), 'left', 'Modified CSS float using "float": Assert float is left'); jQuery('#floatTest').css('font-size', '20px'); diff --git a/test/unit/effects.js b/test/unit/effects.js index 919e3ea..5ac4711 100644 --- a/test/unit/effects.js +++ b/test/unit/effects.js @@ -240,11 +240,11 @@ test("stop()", function() { $foo.animate({ width:'show' }, 1000); setTimeout(function(){ var nw = $foo.width(); - ok( nw != w, "An animation occurred " + nw + "px " + w + "px"); + notEqual( nw, w, "An animation occurred " + nw + "px " + w + "px"); $foo.stop(); nw = $foo.width(); - ok( nw != w, "Stop didn't reset the animation " + nw + "px " + w + "px"); + notEqual( nw, w, "Stop didn't reset the animation " + nw + "px " + w + "px"); setTimeout(function(){ equals( nw, $foo.width(), "The animation didn't continue" ); start(); @@ -266,13 +266,12 @@ test("stop() - several in queue", function() { setTimeout(function(){ equals( $foo.queue().length, 3, "All 3 still in the queue" ); var nw = $foo.width(); - ok( nw != w, "An animation occurred " + nw + "px " + w + "px"); + notEqual( nw, w, "An animation occurred " + nw + "px " + w + "px"); $foo.stop(); nw = $foo.width(); - ok( nw != w, "Stop didn't reset the animation " + nw + "px " + w + "px"); - // Disabled, being flaky - //equals( $foo.queue().length, 1, "The next animation continued" ); + notEqual( nw, w, "Stop didn't reset the animation " + nw + "px " + w + "px"); + $foo.stop(true); start(); }, 100); @@ -390,16 +389,16 @@ jQuery.each( { "CSS Auto": function(elem,prop){ jQuery(elem).addClass("auto" + prop) .text("This is a long string of text."); - return ""; + return prop == "opacity" ? 1 : ""; }, "JS Auto": function(elem,prop){ jQuery(elem).css(prop,"auto") .text("This is a long string of text."); - return ""; + return prop == "opacity" ? 1 : ""; }, "CSS 100": function(elem,prop){ jQuery(elem).addClass("large" + prop); - return ""; + return prop == "opacity" ? 1 : ""; }, "JS 100": function(elem,prop){ jQuery(elem).css(prop,prop == "opacity" ? 1 : "100px"); @@ -407,7 +406,7 @@ jQuery.each( { }, "CSS 50": function(elem,prop){ jQuery(elem).addClass("med" + prop); - return ""; + return prop == "opacity" ? 0.5 : ""; }, "JS 50": function(elem,prop){ jQuery(elem).css(prop,prop == "opacity" ? 0.50 : "50px"); @@ -415,7 +414,7 @@ jQuery.each( { }, "CSS 0": function(elem,prop){ jQuery(elem).addClass("no" + prop); - return ""; + return prop == "opacity" ? 0 : ""; }, "JS 0": function(elem,prop){ jQuery(elem).css(prop,prop == "opacity" ? 0 : "0px"); @@ -475,15 +474,18 @@ jQuery.each( { equals( this.style.display, "block", "Showing, display should block: " + this.style.display); if ( t_w == "hide"||t_w == "show" ) - equals(this.style.width.indexOf(f_w), 0, "Width must be reset to " + f_w + ": " + this.style.width); + ok(f_w === "" ? this.style.width === f_w : this.style.width.indexOf(f_w) === 0, "Width must be reset to " + f_w + ": " + this.style.width); if ( t_h == "hide"||t_h == "show" ) - equals(this.style.height.indexOf(f_h), 0, "Height must be reset to " + f_h + ": " + this.style.height); + ok(f_h === "" ? this.style.height === f_h : this.style.height.indexOf(f_h) === 0, "Height must be reset to " + f_h + ": " + this.style.height); var cur_o = jQuery.style(this, "opacity"); - if ( cur_o !== "" ) cur_o = parseFloat( cur_o ); + + if ( cur_o !== "" ) { + cur_o = jQuery.css(this, "opacity"); + } - if ( t_o == "hide"||t_o == "show" ) + if ( t_o == "hide" || t_o == "show" ) equals(cur_o, f_o, "Opacity must be reset to " + f_o + ": " + cur_o); if ( t_w == "hide" ) @@ -492,7 +494,7 @@ jQuery.each( { if ( t_o.constructor == Number ) { equals(cur_o, t_o, "Final opacity should be " + t_o + ": " + cur_o); - ok(jQuery.curCSS(this, "opacity") != "" || cur_o == t_o, "Opacity should be explicitly set to " + t_o + ", is instead: " + cur_o); + ok(jQuery.css(this, "opacity") != "" || cur_o == t_o, "Opacity should be explicitly set to " + t_o + ", is instead: " + cur_o); } if ( t_w.constructor == Number ) { @@ -512,9 +514,9 @@ jQuery.each( { } if ( t_h == "show" ) { - var old_h = jQuery.curCSS(this, "height"); - jQuery(elem).append("
Some more text
and some more..."); - ok(old_h != jQuery.css(this, "height" ), "Make sure height is auto."); + var old_h = jQuery.css(this, "height"); + jQuery(this).append("
Some more text
and some more..."); + notEqual(jQuery.css(this, "height") + "px", old_h, "Make sure height is auto."); } start(); @@ -532,7 +534,7 @@ jQuery.fn.saveState = function(){ var self = this; self.save = {}; jQuery.each(check, function(i,c){ - self.save[c] = jQuery.css(self,c); + self.save[c] = self.style[ c ] || jQuery.css(self,c); }); }); }; @@ -540,8 +542,8 @@ jQuery.fn.saveState = function(){ jQuery.checkState = function(){ var self = this; jQuery.each(this.save, function(c,v){ - var cur = jQuery.css(self,c); - equals( v, cur, "Make sure that " + c + " is reset (Old: " + v + " Cur: " + cur + ")"); + var cur = self.style[ c ] || jQuery.css(self, c); + equals( cur, v, "Make sure that " + c + " is reset (Old: " + v + " Cur: " + cur + ")"); }); start(); }