Skip to content

J
jquery
Commit c18f1f11 authored by Dave Methvin's avatar Dave Methvin
Browse files
Options

Detect IE collapsing body margin directly rather than inferring it.

parent 5c375065
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 7 deletions
test/unit/offset.js
View file @ c18f1f11
...@@ -144,8 +144,8 @@ testIframe("offset/absolute", "absolute", function( jQuery ) { ...@@ -144,8 +144,8 @@ testIframe("offset/absolute", "absolute", function( jQuery ) {
testIframe("offset/relative", "relative", function( jQuery ) { testIframe("offset/relative", "relative", function( jQuery ) {
expect(60); expect(60);
// IE is collapsing the top margin of 1px // IE is collapsing the top margin of 1px; detect and adjust accordingly
var ie = document.documentMode && document.documentMode < 8; var ie = jQuery("#relative-1").offset().top === 6;
// get offset // get offset
var tests = [ var tests = [
...@@ -205,8 +205,8 @@ testIframe("offset/relative", "relative", function( jQuery ) { ...@@ -205,8 +205,8 @@ testIframe("offset/relative", "relative", function( jQuery ) {
testIframe("offset/static", "static", function( jQuery ) { testIframe("offset/static", "static", function( jQuery ) {
expect(80); expect(80);
// IE is collapsing the top margin of 1px // IE is collapsing the top margin of 1px; detect and adjust accordingly
var ie = document.documentMode && document.documentMode < 8; var ie = jQuery("#static-1").offset().top === 6;
// get offset // get offset
var tests = [ var tests = [
...@@ -349,13 +349,12 @@ testIframe("offset/table", "table", function( jQuery ) { ...@@ -349,13 +349,12 @@ testIframe("offset/table", "table", function( jQuery ) {
testIframe("offset/scroll", "scroll", function( jQuery, win ) { testIframe("offset/scroll", "scroll", function( jQuery, win ) {
expect(26); 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().top, ie ? 6 : 7, "jQuery('#scroll-1').offset().top" );
equal( jQuery("#scroll-1").offset().left, 7, "jQuery('#scroll-1').offset().left" ); 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().top, ie ? 9 : 11, "jQuery('#scroll-1-1').offset().top" );
equal( jQuery("#scroll-1-1").offset().left, 11, "jQuery('#scroll-1-1').offset().left" ); equal( jQuery("#scroll-1-1").offset().left, 11, "jQuery('#scroll-1-1').offset().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