Commit 0654711e authored by Richard McDaniel's avatar Richard McDaniel Committed by Timmy Willison

Offset: account for scroll when calculating position

Fixes gh-1708
Close gh-1714
parent b35bea14
...@@ -137,8 +137,11 @@ jQuery.fn.extend({ ...@@ -137,8 +137,11 @@ jQuery.fn.extend({
} }
// Add offsetParent borders // Add offsetParent borders
parentOffset.top += jQuery.css( offsetParent[ 0 ], "borderTopWidth", true ); // Subtract offsetParent scroll positions
parentOffset.left += jQuery.css( offsetParent[ 0 ], "borderLeftWidth", true ); parentOffset.top += jQuery.css( offsetParent[ 0 ], "borderTopWidth", true ) -
offsetParent.scrollTop();
parentOffset.left += jQuery.css( offsetParent[ 0 ], "borderLeftWidth", true ) -
offsetParent.scrollLeft();
} }
// Subtract parent offsets and element margins // Subtract parent offsets and element margins
......
...@@ -412,7 +412,7 @@ testIframe("offset/table", "table", function( $ ) { ...@@ -412,7 +412,7 @@ testIframe("offset/table", "table", function( $ ) {
}); });
testIframe("offset/scroll", "scroll", function( $, win ) { testIframe("offset/scroll", "scroll", function( $, win ) {
expect(24); expect(28);
// If we're going to bastardize the tests, let's just DO it // If we're going to bastardize the tests, let's just DO it
var ie = /msie 8/i.test( navigator.userAgent ); var ie = /msie 8/i.test( navigator.userAgent );
...@@ -473,6 +473,17 @@ testIframe("offset/scroll", "scroll", function( $, win ) { ...@@ -473,6 +473,17 @@ testIframe("offset/scroll", "scroll", function( $, win ) {
notEqual( $().scrollLeft(null), null, "jQuery().scrollLeft(null) testing setter on empty jquery object" ); 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( $().scrollTop(), null, "jQuery().scrollTop(100) testing setter on empty jquery object" );
strictEqual( $().scrollLeft(), null, "jQuery().scrollLeft(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( $ ) { testIframe("offset/body", "body", function( $ ) {
......
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