Skip to content
Permalink
Browse files

Fix test of #13855 for Opera 12.1 and IE10

  • Loading branch information...
markelog committed Aug 10, 2013
1 parent 2bdeb6b commit 5bbfa46aba1e6d2d56923f77b194371791f75061
Showing with 5 additions and 5 deletions.
  1. +5 −5 test/unit/effects.js
@@ -1414,10 +1414,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();
@@ -1429,16 +1429,16 @@ 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() {
animated.each(function( i ) {
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();

0 comments on commit 5bbfa46

Please sign in to comment.
You can’t perform that action at this time.