diff options
| author | Richard McDaniel <rm0026@uah.edu> | 2014-10-16 15:32:46 -0400 |
|---|---|---|
| committer | Timmy Willison <timmywillisn@gmail.com> | 2015-05-12 10:36:45 -0400 |
| commit | 0654711e0d929187249ca9507ae5881c72947843 (patch) | |
| tree | a582ddf6ad16b51337bf2ef4c15c15bc4dfa825b /test/unit | |
| parent | b35bea14a9b1ff6b9ba96e0c51e21bfeecfc4c4a (diff) | |
| download | jquery-0654711e0d929187249ca9507ae5881c72947843.tar.gz jquery-0654711e0d929187249ca9507ae5881c72947843.zip | |
Offset: account for scroll when calculating position
Fixes gh-1708
Close gh-1714
Diffstat (limited to 'test/unit')
| -rw-r--r-- | test/unit/offset.js | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/test/unit/offset.js b/test/unit/offset.js index 3977e3933..b6ec93de6 100644 --- a/test/unit/offset.js +++ b/test/unit/offset.js @@ -412,7 +412,7 @@ testIframe("offset/table", "table", function( $ ) { }); testIframe("offset/scroll", "scroll", function( $, win ) { - expect(24); + expect(28); // If we're going to bastardize the tests, let's just DO it var ie = /msie 8/i.test( navigator.userAgent ); @@ -473,6 +473,17 @@ testIframe("offset/scroll", "scroll", function( $, win ) { notEqual( $().scrollLeft(null), null, "jQuery().scrollLeft(null) testing setter on empty jquery object" ); strictEqual( $().scrollTop(), null, "jQuery().scrollTop(100) testing setter on empty jquery object" ); strictEqual( $().scrollLeft(), null, "jQuery().scrollLeft(100) testing setter on empty jquery object" ); + + // Tests position after parent scrolling (#15239) + $("#scroll-1").scrollTop(0); + $("#scroll-1").scrollLeft(0); + equal( $("#scroll-1-1").position().top, 6, "jQuery('#scroll-1-1').position().top unaffected by parent scrolling" ); + equal( $("#scroll-1-1").position().left, 6, "jQuery('#scroll-1-1').position().left unaffected by parent scrolling" ); + + $("#scroll-1").scrollTop(5); + $("#scroll-1").scrollLeft(5); + equal( $("#scroll-1-1").position().top, 6, "jQuery('#scroll-1-1').position().top unaffected by parent scrolling" ); + equal( $("#scroll-1-1").position().left, 6, "jQuery('#scroll-1-1').position().left unaffected by parent scrolling" ); }); testIframe("offset/body", "body", function( $ ) { |