diff options
author | Michał Gołębiowski <m.goleb@gmail.com> | 2013-09-07 02:46:55 +0200 |
---|---|---|
committer | Michał Gołębiowski <m.goleb@gmail.com> | 2013-11-11 00:43:27 +0100 |
commit | 4b39a8289031bb7de25e9f018d9fd8235a35ec49 (patch) | |
tree | 1fe8494c0be1e315a81c739d70f7b390823e5eb8 /test/unit/effects.js | |
parent | 2ace149f485438e8a3af6650f3bb18c1c22e48b6 (diff) | |
download | jquery-4b39a8289031bb7de25e9f018d9fd8235a35ec49.tar.gz jquery-4b39a8289031bb7de25e9f018d9fd8235a35ec49.zip |
Fix #14340. Remove remnants of oldIE from unit tests. Close gh-1425.
Diffstat (limited to 'test/unit/effects.js')
-rw-r--r-- | test/unit/effects.js | 34 |
1 files changed, 8 insertions, 26 deletions
diff --git a/test/unit/effects.js b/test/unit/effects.js index 71228d7e4..6b251c4ca 100644 --- a/test/unit/effects.js +++ b/test/unit/effects.js @@ -355,17 +355,13 @@ test("animate table width/height", function() { test("animate table-row width/height", function() { expect(3); stop(); - var displayMode, - tr = jQuery("#table") + var tr = jQuery( "#table" ) .attr({ "cellspacing": 0, "cellpadding": 0, "border": 0 }) - .html("<tr style='height:42px;'><td style='padding:0;'><div style='width:20px;height:20px;'></div></td></tr>") - .find("tr"); - - // IE<8 uses "block" instead of the correct display type - displayMode = tr.css("display") !== "table-row" ? "block" : "table-row"; + .html( "<tr style='height:42px;'><td style='padding:0;'><div style='width:20px;height:20px;'></div></td></tr>" ) + .find( "tr" ); tr.animate({ width: 10, height: 10 }, 100, function() { - equal( jQuery(this).css("display"), displayMode, "display mode is correct" ); + equal( jQuery( this ).css( "display" ), "table-row", "display mode is correct" ); equal( this.offsetWidth, 20, "width animated to shrink wrap point" ); equal( this.offsetHeight, 20, "height animated to shrink wrap point" ); start(); @@ -375,17 +371,13 @@ test("animate table-row width/height", function() { test("animate table-cell width/height", function() { expect(3); stop(); - var displayMode, - td = jQuery("#table") + var td = jQuery( "#table" ) .attr({ "cellspacing": 0, "cellpadding": 0, "border": 0 }) - .html("<tr><td style='width:42px;height:42px;padding:0;'><div style='width:20px;height:20px;'></div></td></tr>") - .find("td"); - - // IE<8 uses "block" instead of the correct display type - displayMode = td.css("display") !== "table-cell" ? "block" : "table-cell"; + .html( "<tr><td style='width:42px;height:42px;padding:0;'><div style='width:20px;height:20px;'></div></td></tr>" ) + .find( "td" ); td.animate({ width: 10, height: 10 }, 100, function() { - equal( jQuery(this).css("display"), displayMode, "display mode is correct" ); + equal( jQuery( this ).css( "display" ), "table-cell", "display mode is correct" ); equal( this.offsetWidth, 20, "width animated to shrink wrap point" ); equal( this.offsetHeight, 20, "height animated to shrink wrap point" ); start(); @@ -990,16 +982,6 @@ jQuery.each({ f_o = f( elem, "opacity" ); } - // The only time an _empty_string_ will be matched is in IE - // otherwise, the correct values will be tested as usual - if ( f_o === "" ) { - f_o = 1; - } - // See above - if ( cur_o === "" ) { - cur_o = 1; - } - if ( t_o === "hide" || t_o === "show" ) { equal( cur_o, f_o, "Opacity must be reset to " + f_o + ": " + cur_o ); } |