Made a tweak to the fx queue test (was randomly failing in its current incarnation).
[jquery.git] / test / unit / fx.js
index 63a3de7..c6da80d 100644 (file)
@@ -61,7 +61,7 @@ test("animate option (queue === false)", function () {
                // short duration and out of queue so should finish first
                order.push(1);
        }});
-       $foo.animate({height:'100px'}, 10, function() {
+       $foo.animate({height:'100px'}, 100, function() {
                // queued behind the first animation so should finish third 
                order.push(3);
                isSet( order, [ 1, 2, 3], "Animations finished in the correct order" );
@@ -365,7 +365,7 @@ jQuery.each( {
                                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);
                                        
-                               var cur_o = jQuery.attr(this.style, "opacity");
+                               var cur_o = jQuery.style(this, "opacity");
                                if ( cur_o !== "" ) cur_o = parseFloat( cur_o );
        
                                if ( t_o == "hide"||t_o == "show" )