Commit 5c60e334 authored by Dave Methvin's avatar Dave Methvin

Avoid running problematic static offset tests in IE8 on the swarm.

parent cef41611
...@@ -206,15 +206,18 @@ testIframe("offset/static", "static", function( jQuery ) { ...@@ -206,15 +206,18 @@ testIframe("offset/static", "static", function( jQuery ) {
expect(80); expect(80);
// IE is collapsing the top margin of 1px; detect and adjust accordingly // IE is collapsing the top margin of 1px; detect and adjust accordingly
var ie = jQuery("#static-1").offset().top === 6; var ie = jQuery("#static-1").offset().top === 6,
swarmy = document.documentMode === 8 && window.location.search.indexOf("swarmURL") >= 0;
// get offset // get offset
var tests = [ var tests = [
{ id: "#static-1", top: ie ? 6 : 7, left: 7 }, { id: "#static-1", top: ie ? 6 : 7, left: 7 },
{ id: "#static-1-1", top: ie ? 13 : 15, left: 15 }, { id: "#static-1-1", top: ie ? 13 : 15, left: 15 },
{ id: "#static-1-1-1", top: ie ? 20 : 23, left: 23 }, { id: "#static-1-1-1", top: ie ? 20 : 23, left: 23 }
{ id: "#static-2", top: ie ? 121 : 122, left: 7 }
]; ];
if ( !swarmy ) {
tests.push({ id: "#static-2", top: ie ? 121 : 122, left: 7 });
}
jQuery.each( tests, function() { jQuery.each( tests, function() {
equal( jQuery( this.id ).offset().top, this.top, "jQuery('" + this.id + "').offset().top" ); equal( jQuery( this.id ).offset().top, this.top, "jQuery('" + this.id + "').offset().top" );
equal( jQuery( this.id ).offset().left, this.left, "jQuery('" + this.id + "').offset().left" ); equal( jQuery( this.id ).offset().left, this.left, "jQuery('" + this.id + "').offset().left" );
...@@ -225,9 +228,11 @@ testIframe("offset/static", "static", function( jQuery ) { ...@@ -225,9 +228,11 @@ testIframe("offset/static", "static", function( jQuery ) {
tests = [ tests = [
{ id: "#static-1", top: ie ? 5 : 6, left: 6 }, { id: "#static-1", top: ie ? 5 : 6, left: 6 },
{ id: "#static-1-1", top: ie ? 12 : 14, left: 14 }, { id: "#static-1-1", top: ie ? 12 : 14, left: 14 },
{ id: "#static-1-1-1", top: ie ? 19 : 22, left: 22 }, { id: "#static-1-1-1", top: ie ? 19 : 22, left: 22 }
{ id: "#static-2", top: ie ? 120 : 121, left: 6 }
]; ];
if ( !swarmy ) {
tests.push({ id: "#static-2", top: ie ? 120 : 121, left: 6 });
}
jQuery.each( tests, function() { jQuery.each( tests, function() {
equal( jQuery( this.id ).position().top, this.top, "jQuery('" + this.top + "').position().top" ); equal( jQuery( this.id ).position().top, this.top, "jQuery('" + this.top + "').position().top" );
equal( jQuery( this.id ).position().left, this.left, "jQuery('" + this.left +"').position().left" ); equal( jQuery( this.id ).position().left, this.left, "jQuery('" + this.left +"').position().left" );
......
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