deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Reverted back to using the num helper method in offset.js

Browse source
This commit is contained in:
Brandon Aaron 2008-05-15 20:29:52 +00:00
parent de6520b50e
commit 82ba3709ee
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/offset.js
View file

@ -112,12 +112,14 @@ jQuery.fn.extend({
parentOffset = /^body|html$/i.test(offsetParent[0].tagName) ? { top: 0, left: 0 } : offsetParent.offset(); parentOffset = /^body|html$/i.test(offsetParent[0].tagName) ? { top: 0, left: 0 } : offsetParent.offset();
// Subtract element margins // Subtract element margins
offset.top -= parseInt( jQuery.curCSS( this[0], 'marginTop', true ), 10 ) || 0; // note: when an element has margin: auto the offsetLeft and marginLeft
offset.left -= parseInt( jQuery.curCSS( this[0], 'marginLeft', true ), 10 ) || 0; // are the same in Safari causing offset.left to incorrectly be 0
offset.top -= num( this, 'marginTop' );
offset.left -= num( this, 'marginLeft' );
// Add offsetParent borders // Add offsetParent borders
parentOffset.top += parseInt( jQuery.curCSS( offsetParent[0], 'borderTopWidth', true ), 10 ) || 0; parentOffset.top += num( offsetParent, 'borderTopWidth' );
parentOffset.left += parseInt( jQuery.curCSS( offsetParent[0], 'borderLeftWidth', true ), 10 ) || 0; parentOffset.left += num( offsetParent, 'borderLeftWidth' );
// Subtract the two offsets // Subtract the two offsets
results = { results = {