Ever notice that static and problematic rhyme?

This commit is contained in:
Dave Methvin 2012-07-03 22:54:59 -04:00
parent 5c60e334d3
commit 703f274ad4

View File

@ -203,12 +203,13 @@ testIframe("offset/relative", "relative", function( jQuery ) {
}); });
testIframe("offset/static", "static", function( jQuery ) { testIframe("offset/static", "static", function( jQuery ) {
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; swarmy = document.documentMode === 8 && window.location.search.indexOf("swarmURL") >= 0;
expect( swarmy? 68 : 80 );
// 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 },
@ -243,8 +244,6 @@ testIframe("offset/static", "static", function( jQuery ) {
tests = [ tests = [
{ id: "#static-2", top: 200, left: 200 }, { id: "#static-2", top: 200, left: 200 },
{ id: "#static-2", top: 100, left: 100 }, { id: "#static-2", top: 100, left: 100 },
{ id: "#static-2", top: -2, left: -2 },
{ id: "#static-2", top: 121, left: 6 },
{ id: "#static-1-1-1", top: 50, left: 50 }, { id: "#static-1-1-1", top: 50, left: 50 },
{ id: "#static-1-1-1", top: 10, left: 10 }, { id: "#static-1-1-1", top: 10, left: 10 },
{ id: "#static-1-1-1", top: -1, left: -1 }, { id: "#static-1-1-1", top: -1, left: -1 },
@ -258,6 +257,12 @@ testIframe("offset/static", "static", function( jQuery ) {
{ id: "#static-1", top: -2, left: -2 }, { id: "#static-1", top: -2, left: -2 },
{ id: "#static-1", top: 7, left: 7 } { id: "#static-1", top: 7, left: 7 }
]; ];
if ( !swarmy ) {
tests.push(
{ id: "#static-2", top: -2, left: -2 },
{ id: "#static-2", top: 121, left: 6 }
);
}
jQuery.each( tests, function() { jQuery.each( tests, function() {
jQuery( this.id ).offset({ top: this.top, left: this.left }); jQuery( this.id ).offset({ top: this.top, left: this.left });
equal( jQuery( this.id ).offset().top, this.top, "jQuery('" + this.id + "').offset({ top: " + this.top + " })" ); equal( jQuery( this.id ).offset().top, this.top, "jQuery('" + this.id + "').offset({ top: " + this.top + " })" );