library-mirrors/jquery
1
0
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2024-11-23 02:54:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Offset: account for scroll when calculating position

Browse Source 
Fixes gh-1708
Close gh-1714
This commit is contained in:
Richard McDaniel 2014-10-16 15:32:46 -04:00 committed by Timmy Willison
parent c252c5fac2
commit 2d715940b9
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/offset.js
View File

@ -131,8 +131,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

13
test/unit/offset.js
View File

@ -407,7 +407,7 @@ testIframe("offset/table", "table", function( $ ) {
}); });
testIframe("offset/scroll", "scroll", function( $, win ) { testIframe("offset/scroll", "scroll", function( $, win ) {
expect(24); expect(28);
equal( $("#scroll-1").offset().top, 7, "jQuery('#scroll-1').offset().top" ); equal( $("#scroll-1").offset().top, 7, "jQuery('#scroll-1').offset().top" );
equal( $("#scroll-1").offset().left, 7, "jQuery('#scroll-1').offset().left" ); equal( $("#scroll-1").offset().left, 7, "jQuery('#scroll-1').offset().left" );
@ -457,6 +457,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( $ ) {