]> source.dussan.org Git - jquery.git/commitdiff
Fix test of #13855 for Opera 12.1 and IE10
authorOleg <markelog@gmail.com>
Sat, 10 Aug 2013 03:47:21 +0000 (07:47 +0400)
committerOleg <markelog@gmail.com>
Sat, 10 Aug 2013 04:00:09 +0000 (08:00 +0400)
test/unit/effects.js

index 113390e6feb6ed9c516100f01362277be0a29955..82ca6c26cb055b760e70c9832e72e1a94c398fda 100644 (file)
@@ -1448,10 +1448,10 @@ test("Do not append px to 'fill-opacity' #9548", 1, function() {
 asyncTest("line-height animates correctly (#13855)", 12, function() {
        var
                animated = jQuery(
-                       "<p style='line-height: 5000;'>unitless</p>" +
+                       "<p style='line-height: 100;'>unitless</p>" +
                        "<p style='line-height: 5000px;'>px</p>" +
                        "<p style='line-height: 5000%;'>percent</p>" +
-                       "<p style='line-height: 5000em;'>em</p>"
+                       "<p style='line-height: 100em;'>em</p>"
                ).appendTo("#qunit-fixture"),
                initialHeight = jQuery.map( animated, function( el ) {
                        return jQuery( el ).height();
@@ -1463,8 +1463,8 @@ asyncTest("line-height animates correctly (#13855)", 12, function() {
                        var label = jQuery.text( this ),
                                initial = initialHeight[ i ],
                                height = jQuery( this ).height();
-                       ok( height < initial, "hide " + label + ": upper bound; height:" + height + "; intitial: " + initial );
-                       ok( height > initial / 2, "hide " + label + ": lower bound; height:"  + height + "; intitial/2: " + initial / 2 );
+                       ok( height < initial, "hide " + label + ": upper bound; height: " + height + "; intitial: " + initial );
+                       ok( height > initial / 3, "hide " + label + ": lower bound; height: "  + height + "; intitial/3: " + initial );
                });
                animated.stop( true, true ).hide().animate( { "line-height": "show" }, 1500 );
                setTimeout(function() {
@@ -1472,7 +1472,7 @@ asyncTest("line-height animates correctly (#13855)", 12, function() {
                                var label = jQuery.text( this ),
                                        initial = initialHeight[ i ],
                                        height = jQuery( this ).height();
-                               ok( height < initial / 2, "show " + label + ": upper bound; height:" + height + "; intitial/2: " + initial / 2 );
+                               ok( height < initial / 2, "show " + label + ": upper bound; height: " + height + "; intitial/2: " + initial / 2 );
                        });
                        animated.stop( true, true );
                        start();