X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=test%2Funit%2Feffects.js;h=32ce583b303cc6774f7a91f69bed94a40751468a;hb=99fcf3babbba8b794fe8b0b2e20d517156cfd4d2;hp=6129d5d319998553286349bfe10447a5c3bf2b6d;hpb=37b607d2815b893d13de4ac3461090d0dd46535e;p=jquery.git diff --git a/test/unit/effects.js b/test/unit/effects.js index 6129d5d..32ce583 100644 --- a/test/unit/effects.js +++ b/test/unit/effects.js @@ -475,15 +475,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.css(this, "opacity"); - if ( cur_o !== "" ) cur_o = parseFloat( cur_o ); + var cur_o = jQuery.style(this, "opacity"); + + 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" )