From: Dave Methvin <dave.methvin@gmail.com>
Date: Mon, 18 Jun 2012 20:02:26 +0000 (-0400)
Subject: Detect IE collapsing body margin directly rather than inferring it.
X-Git-Tag: 1.8b1~21
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c18f1f119e07b08793ffb1e98621170f5f2eaba4;p=jquery.git

Detect IE collapsing body margin directly rather than inferring it.
---

diff --git a/test/unit/offset.js b/test/unit/offset.js
index 633b400f0..8cd5d8344 100644
--- a/test/unit/offset.js
+++ b/test/unit/offset.js
@@ -144,8 +144,8 @@ testIframe("offset/absolute", "absolute", function( jQuery ) {
 testIframe("offset/relative", "relative", function( jQuery ) {
 	expect(60);
 
-	// IE is collapsing the top margin of 1px
-	var ie = document.documentMode && document.documentMode < 8;
+	// IE is collapsing the top margin of 1px; detect and adjust accordingly
+	var ie = jQuery("#relative-1").offset().top === 6;
 
 	// get offset
 	var tests = [
@@ -205,8 +205,8 @@ testIframe("offset/relative", "relative", function( jQuery ) {
 testIframe("offset/static", "static", function( jQuery ) {
 	expect(80);
 
-	// IE is collapsing the top margin of 1px
-	var ie = document.documentMode && document.documentMode < 8;
+	// IE is collapsing the top margin of 1px; detect and adjust accordingly
+	var ie = jQuery("#static-1").offset().top === 6;
 
 	// get offset
 	var tests = [
@@ -349,13 +349,12 @@ testIframe("offset/table", "table", function( jQuery ) {
 testIframe("offset/scroll", "scroll", function( jQuery, win ) {
 	expect(26);
 
-	var ie = document.documentMode && document.documentMode < 8;
+	// IE is collapsing the top margin of 1px; detect and adjust accordingly
+	var ie = jQuery("#scroll-1").offset().top == 6;
 
-	// IE is collapsing the top margin of 1px
 	equal( jQuery("#scroll-1").offset().top, ie ? 6 : 7, "jQuery('#scroll-1').offset().top" );
 	equal( jQuery("#scroll-1").offset().left, 7, "jQuery('#scroll-1').offset().left" );
 
-	// IE is collapsing the top margin of 1px
 	equal( jQuery("#scroll-1-1").offset().top, ie ? 9 : 11, "jQuery('#scroll-1-1').offset().top" );
 	equal( jQuery("#scroll-1-1").offset().left, 11, "jQuery('#scroll-1-1').offset().left" );