Commit fad0e221 authored by Mike Sherov's avatar Mike Sherov

fix failing offset tests

parent a1514719
...@@ -295,11 +295,26 @@ testIframe("offset/static", "static", function( $ ) { ...@@ -295,11 +295,26 @@ testIframe("offset/static", "static", function( $ ) {
}); });
testIframe("offset/fixed", "fixed", function( $ ) { testIframe("offset/fixed", "fixed", function( $ ) {
// IE is collapsing the top margin of 1px; detect and adjust accordingly
var ie = $("#fixed-1").position().top === 2;
expect(34); expect(34);
var tests = [ var tests = [
{ "id": "#fixed-1", "offsetTop": 1001, "offsetLeft": 1001, "positionTop": 0, "positionLeft": 0 }, {
{ "id": "#fixed-2", "offsetTop": 1021, "offsetLeft": 1021, "positionTop": 20, "positionLeft": 20 } "id": "#fixed-1",
"offsetTop": 1001,
"offsetLeft": 1001,
"positionTop": ie ? 2 : 0,
"positionLeft": ie ? 2 : 0
},
{
"id": "#fixed-2",
"offsetTop": 1021,
"offsetLeft": 1021,
"positionTop": ie ? 22 : 20,
"positionLeft": ie ? 22 : 20
}
]; ];
jQuery.each( tests, function() { jQuery.each( tests, function() {
...@@ -318,6 +333,8 @@ testIframe("offset/fixed", "fixed", function( $ ) { ...@@ -318,6 +333,8 @@ testIframe("offset/fixed", "fixed", function( $ ) {
// need to have same number of assertions // need to have same number of assertions
ok( true, "Fixed position is not supported" ); ok( true, "Fixed position is not supported" );
ok( true, "Fixed position is not supported" ); ok( true, "Fixed position is not supported" );
ok( true, "Fixed position is not supported" );
ok( true, "Fixed position is not supported" );
} }
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment