aboutsummaryrefslogtreecommitdiffstats
path: root/test/unit/effects.js
diff options
context:
space:
mode:
authortimmywil <timmywillisn@gmail.com>2011-08-16 11:19:06 -0400
committertimmywil <timmywillisn@gmail.com>2011-08-16 11:19:19 -0400
commit0b8b6360127dacc36d06753bf934ff97e5973535 (patch)
tree4f83ff02ce2d6a50e42af95689ebe38a6240bf29 /test/unit/effects.js
parentb22c9046529852c7ce567df13397849e11e2b9cc (diff)
downloadjquery-0b8b6360127dacc36d06753bf934ff97e5973535.tar.gz
jquery-0b8b6360127dacc36d06753bf934ff97e5973535.zip
Fix effects test suite to account for opacity being removed rather than explicity set to 1
Diffstat (limited to 'test/unit/effects.js')
-rw-r--r--test/unit/effects.js5
1 files changed, 4 insertions, 1 deletions
diff --git a/test/unit/effects.js b/test/unit/effects.js
index 864c4a400..a22deba5b 100644
--- a/test/unit/effects.js
+++ b/test/unit/effects.js
@@ -726,6 +726,9 @@ jQuery.each( {
var f_h = f( elem, "height" );
var t_o = t( elem, "opacity" );
var f_o = f( elem, "opacity" );
+ if ( f_o === "" ) {
+ f_o = 1;
+ }
var num = 0;
@@ -759,7 +762,7 @@ jQuery.each( {
if ( t_h == "hide"||t_h == "show" )
ok(f_h === "" ? elem.style.height === f_h : elem.style.height.indexOf(f_h) === 0, "Height must be reset to " + f_h + ": " + elem.style.height);
- var cur_o = jQuery.style(elem, "opacity");
+ var cur_o = jQuery.css(elem, "opacity");
if ( t_o == "hide" || t_o == "show" )
equals(cur_o, f_o, "Opacity must be reset to " + f_o + ": " + cur_o);