diff options
| author | John Resig <jeresig@gmail.com> | 2010-09-17 13:38:13 -0400 |
|---|---|---|
| committer | John Resig <jeresig@gmail.com> | 2010-09-17 13:38:13 -0400 |
| commit | 99fcf3babbba8b794fe8b0b2e20d517156cfd4d2 (patch) | |
| tree | 8e0d715b632426da583749cd87b4ccc00aa6b020 /test | |
| parent | 37b607d2815b893d13de4ac3461090d0dd46535e (diff) | |
| download | jquery-99fcf3babbba8b794fe8b0b2e20d517156cfd4d2.tar.gz jquery-99fcf3babbba8b794fe8b0b2e20d517156cfd4d2.zip | |
Fixed some sloppy checks in the effects test suite, makes it more apparent where issues are happening.
Diffstat (limited to 'test')
| -rw-r--r-- | test/unit/effects.js | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/test/unit/effects.js b/test/unit/effects.js index 6129d5d31..32ce583b3 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" ) |