diff options
Diffstat (limited to 'test/unit/offset.js')
| -rw-r--r-- | test/unit/offset.js | 41 |
1 files changed, 11 insertions, 30 deletions
diff --git a/test/unit/offset.js b/test/unit/offset.js index a62ebde5b..5cece84f4 100644 --- a/test/unit/offset.js +++ b/test/unit/offset.js @@ -14,7 +14,6 @@ var alwaysScrollable, // Append forceScroll to the body instead of #qunit-fixture because the latter is hidden forceScroll.appendTo( "body" ); window.scrollTo( 200, 200 ); - window.supportsScroll = document.documentElement.scrollTop || document.body.scrollTop; forceScroll.detach(); // Support: iOS <=7 - 12+ @@ -363,7 +362,7 @@ testIframe( "static", "offset/static.html", function( assert, $ ) { } ); } ); -testIframe( "fixed", "offset/fixed.html", function( assert, $, window ) { +testIframe( "fixed", "offset/fixed.html", function( assert, $ ) { assert.expect( 38 ); var tests, $noTopLeft; @@ -386,22 +385,12 @@ testIframe( "fixed", "offset/fixed.html", function( assert, $, window ) { ]; jQuery.each( tests, function() { - if ( !window.supportsScroll ) { - assert.ok( true, "Browser doesn't support scroll position." ); - assert.ok( true, "Browser doesn't support scroll position." ); - assert.ok( true, "Browser doesn't support scroll position." ); - assert.ok( true, "Browser doesn't support scroll position." ); - assert.ok( true, "Browser doesn't support scroll position." ); - assert.ok( true, "Browser doesn't support scroll position." ); - - } else { - assert.equal( jQuery.isPlainObject( $( this.id ).offset() ), true, "jQuery('" + this.id + "').offset() is plain object" ); - assert.equal( jQuery.isPlainObject( $( this.id ).position() ), true, "jQuery('" + this.id + "').position() is plain object" ); - assert.equal( $( this.id ).offset().top, this.offsetTop, "jQuery('" + this.id + "').offset().top" ); - assert.equal( $( this.id ).position().top, this.positionTop, "jQuery('" + this.id + "').position().top" ); - assert.equal( $( this.id ).offset().left, this.offsetLeft, "jQuery('" + this.id + "').offset().left" ); - assert.equal( $( this.id ).position().left, this.positionLeft, "jQuery('" + this.id + "').position().left" ); - } + assert.equal( jQuery.isPlainObject( $( this.id ).offset() ), true, "jQuery('" + this.id + "').offset() is plain object" ); + assert.equal( jQuery.isPlainObject( $( this.id ).position() ), true, "jQuery('" + this.id + "').position() is plain object" ); + assert.equal( $( this.id ).offset().top, this.offsetTop, "jQuery('" + this.id + "').offset().top" ); + assert.equal( $( this.id ).position().top, this.positionTop, "jQuery('" + this.id + "').position().top" ); + assert.equal( $( this.id ).offset().left, this.offsetLeft, "jQuery('" + this.id + "').offset().left" ); + assert.equal( $( this.id ).position().left, this.positionLeft, "jQuery('" + this.id + "').position().left" ); } ); tests = [ @@ -476,19 +465,11 @@ testIframe( "scroll", "offset/scroll.html", function( assert, $, win ) { win.name = "test"; - if ( !window.supportsScroll ) { - assert.ok( true, "Browser doesn't support scroll position." ); - assert.ok( true, "Browser doesn't support scroll position." ); - - assert.ok( true, "Browser doesn't support scroll position." ); - assert.ok( true, "Browser doesn't support scroll position." ); - } else { - assert.equal( $( win ).scrollTop(), 1000, "jQuery(window).scrollTop()" ); - assert.equal( $( win ).scrollLeft(), 1000, "jQuery(window).scrollLeft()" ); + assert.equal( $( win ).scrollTop(), 1000, "jQuery(window).scrollTop()" ); + assert.equal( $( win ).scrollLeft(), 1000, "jQuery(window).scrollLeft()" ); - assert.equal( $( win.document ).scrollTop(), 1000, "jQuery(document).scrollTop()" ); - assert.equal( $( win.document ).scrollLeft(), 1000, "jQuery(document).scrollLeft()" ); - } + assert.equal( $( win.document ).scrollTop(), 1000, "jQuery(document).scrollTop()" ); + assert.equal( $( win.document ).scrollLeft(), 1000, "jQuery(document).scrollLeft()" ); // test jQuery using parent window/document // jQuery reference here is in the iframe |