diff options
| author | jeresig <jeresig@gmail.com> | 2010-09-27 11:51:01 -0400 |
|---|---|---|
| committer | jeresig <jeresig@gmail.com> | 2010-09-27 11:51:01 -0400 |
| commit | 0be7f4eb4f027dce00f11d7816290022d447d336 (patch) | |
| tree | b4347a748f59041f9ebf1311a6e0f4ec1db7bb44 /test | |
| parent | 0da700a4d03c1c43e75e3ab7f8e719e13c7e444a (diff) | |
| download | jquery-0be7f4eb4f027dce00f11d7816290022d447d336.tar.gz jquery-0be7f4eb4f027dce00f11d7816290022d447d336.zip | |
Make sure that opacity is being reset properly on a show animation. Additionally expose jQuery.isNaN from the data module.
Diffstat (limited to 'test')
| -rw-r--r-- | test/unit/effects.js | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/test/unit/effects.js b/test/unit/effects.js index ed6faa952..b9d5c8841 100644 --- a/test/unit/effects.js +++ b/test/unit/effects.js @@ -389,16 +389,16 @@ jQuery.each( { "CSS Auto": function(elem,prop){ jQuery(elem).addClass("auto" + prop) .text("This is a long string of text."); - return prop == "opacity" ? 1 : ""; + return ""; }, "JS Auto": function(elem,prop){ jQuery(elem).css(prop,"") .text("This is a long string of text."); - return prop == "opacity" ? 1 : ""; + return ""; }, "CSS 100": function(elem,prop){ jQuery(elem).addClass("large" + prop); - return prop == "opacity" ? 1 : ""; + return ""; }, "JS 100": function(elem,prop){ jQuery(elem).css(prop,prop == "opacity" ? 1 : "100px"); @@ -406,7 +406,7 @@ jQuery.each( { }, "CSS 50": function(elem,prop){ jQuery(elem).addClass("med" + prop); - return prop == "opacity" ? 0.5 : ""; + return ""; }, "JS 50": function(elem,prop){ jQuery(elem).css(prop,prop == "opacity" ? 0.50 : "50px"); @@ -414,7 +414,7 @@ jQuery.each( { }, "CSS 0": function(elem,prop){ jQuery(elem).addClass("no" + prop); - return prop == "opacity" ? 0 : ""; + return ""; }, "JS 0": function(elem,prop){ jQuery(elem).css(prop,prop == "opacity" ? 0 : "0px"); @@ -481,10 +481,6 @@ jQuery.each( { var cur_o = jQuery.style(this, "opacity"); - if ( cur_o !== "" ) { - cur_o = jQuery.css(this, "opacity"); - } - if ( t_o == "hide" || t_o == "show" ) equals(cur_o, f_o, "Opacity must be reset to " + f_o + ": " + cur_o); |