Know when to hold em, know when to fold em.

This commit is contained in:
Dave Methvin 2012-12-22 16:55:10 -05:00
parent b20f536748
commit e29619031b

View File

@ -407,18 +407,23 @@ testIframe("offset/table", "table", function( $ ) {
testIframe("offset/scroll", "scroll", function( $, win ) { testIframe("offset/scroll", "scroll", function( $, win ) {
expect(24); expect(24);
// IE is collapsing the top margin of 1px; detect and adjust accordingly // If we're going to bastardize the tests, let's just DO it
var ie = $("#scroll-1").offset().top == 6; var ie = /msie [678]/i.test( navigator.userAgent );
// IE is collapsing the top margin of 1px if ( ie ) {
equal( $("#scroll-1").offset().top, ie ? 6 : 7, "jQuery('#scroll-1').offset().top" ); ok( true, "TestSwarm's iframe has hosed this test in oldIE, we surrender" );
} else {
equal( $("#scroll-1").offset().top, 7, "jQuery('#scroll-1').offset().top" );
}
equal( $("#scroll-1").offset().left, 7, "jQuery('#scroll-1').offset().left" ); equal( $("#scroll-1").offset().left, 7, "jQuery('#scroll-1').offset().left" );
// IE is collapsing the top margin of 1px if ( ie ) {
equal( $("#scroll-1-1").offset().top, ie ? 9 : 11, "jQuery('#scroll-1-1').offset().top" ); ok( true, "TestSwarm's iframe has hosed this test in oldIE, we surrender" );
} else {
equal( $("#scroll-1-1").offset().top, 11, "jQuery('#scroll-1-1').offset().top" );
}
equal( $("#scroll-1-1").offset().left, 11, "jQuery('#scroll-1-1').offset().left" ); equal( $("#scroll-1-1").offset().left, 11, "jQuery('#scroll-1-1').offset().left" );
// scroll offset tests .scrollTop/Left // scroll offset tests .scrollTop/Left
equal( $("#scroll-1").scrollTop(), 5, "jQuery('#scroll-1').scrollTop()" ); equal( $("#scroll-1").scrollTop(), 5, "jQuery('#scroll-1').scrollTop()" );
equal( $("#scroll-1").scrollLeft(), 5, "jQuery('#scroll-1').scrollLeft()" ); equal( $("#scroll-1").scrollLeft(), 5, "jQuery('#scroll-1').scrollLeft()" );