]> source.dussan.org Git - jquery.git/commitdiff
Fix effects test suite to account for opacity being removed rather than explicity...
authortimmywil <timmywillisn@gmail.com>
Tue, 16 Aug 2011 15:19:06 +0000 (11:19 -0400)
committertimmywil <timmywillisn@gmail.com>
Tue, 16 Aug 2011 15:19:19 +0000 (11:19 -0400)
test/unit/effects.js

index 864c4a4008ad611ea91a7f62a6fdfbafc06f6f33..a22deba5b88217de4367823dfc5367579677391b 100644 (file)
@@ -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);