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

using parseFloat for offset and position methods and removed num helper method

Browse source
This commit is contained in:
Brandon Aaron 2009-03-17 21:07:11 +00:00
parent a37cccc882
commit aabf635cfe
2 changed files with 11 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/core.js
View file

@ -1289,8 +1289,3 @@ function cleanData( elems ) {
} }
} }
} }
// Helper function used by the dimensions and offset modules
function num(elem, prop) {
return elem[0] && parseInt( jQuery.curCSS(elem[0], prop, true), 10 ) || 0;
}

22
src/offset.js
View file

@ -28,13 +28,13 @@ else
if ( elem === offsetParent ) { if ( elem === offsetParent ) {
top += elem.offsetTop, left += elem.offsetLeft; top += elem.offsetTop, left += elem.offsetLeft;
if ( jQuery.offset.doesNotAddBorder && !(jQuery.offset.doesAddBorderForTableAndCells && /^t(able|d|h)$/i.test(elem.tagName)) ) if ( jQuery.offset.doesNotAddBorder && !(jQuery.offset.doesAddBorderForTableAndCells && /^t(able|d|h)$/i.test(elem.tagName)) )
top += parseInt( computedStyle.borderTopWidth, 10) || 0, top += parseFloat( computedStyle.borderTopWidth, 10) || 0,
left += parseInt( computedStyle.borderLeftWidth, 10) || 0; left += parseFloat( computedStyle.borderLeftWidth, 10) || 0;
prevOffsetParent = offsetParent, offsetParent = elem.offsetParent; prevOffsetParent = offsetParent, offsetParent = elem.offsetParent;
} }
if ( jQuery.offset.subtractsBorderForOverflowNotVisible && computedStyle.overflow !== "visible" ) if ( jQuery.offset.subtractsBorderForOverflowNotVisible && computedStyle.overflow !== "visible" )
top += parseInt( computedStyle.borderTopWidth, 10) || 0, top += parseFloat( computedStyle.borderTopWidth, 10) || 0,
left += parseInt( computedStyle.borderLeftWidth, 10) || 0; left += parseFloat( computedStyle.borderLeftWidth, 10) || 0;
prevComputedStyle = computedStyle; prevComputedStyle = computedStyle;
} }
@ -79,8 +79,8 @@ jQuery.offset = {
jQuery.offset.initialized || jQuery.offset.initialize(); jQuery.offset.initialized || jQuery.offset.initialize();
var top = body.offsetTop, left = body.offsetLeft; var top = body.offsetTop, left = body.offsetLeft;
if ( jQuery.offset.doesNotIncludeMarginInBodyOffset ) if ( jQuery.offset.doesNotIncludeMarginInBodyOffset )
top += parseInt( jQuery.curCSS(body, 'marginTop', true), 10 ) || 0, top += parseFloat( jQuery.curCSS(body, 'marginTop', true), 10 ) || 0,
left += parseInt( jQuery.curCSS(body, 'marginLeft', true), 10 ) || 0; left += parseFloat( jQuery.curCSS(body, 'marginLeft', true), 10 ) || 0;
return { top: top, left: left }; return { top: top, left: left };
} }
}; };
@ -90,7 +90,7 @@ jQuery.fn.extend({
position: function() { position: function() {
if ( !this[0] ) return null; if ( !this[0] ) return null;
var left = 0, top = 0, results, var elem = this[0], left = 0, top = 0, results,
// Get *real* offsetParent // Get *real* offsetParent
offsetParent = this.offsetParent(), offsetParent = this.offsetParent(),
@ -102,12 +102,12 @@ jQuery.fn.extend({
// Subtract element margins // Subtract element margins
// note: when an element has margin: auto the offsetLeft and marginLeft // note: when an element has margin: auto the offsetLeft and marginLeft
// are the same in Safari causing offset.left to incorrectly be 0 // are the same in Safari causing offset.left to incorrectly be 0
offset.top -= num( this, 'marginTop' ); offset.top -= parseFloat( jQuery.curCSS(elem, 'marginTop', true), 10 ) || 0;
offset.left -= num( this, 'marginLeft' ); offset.left -= parseFloat( jQuery.curCSS(elem, 'marginLeft', true), 10 ) || 0;
// Add offsetParent borders // Add offsetParent borders
parentOffset.top += num( offsetParent, 'borderTopWidth' ); parentOffset.top += parseFloat( jQuery.curCSS(offsetParent[0], 'borderTopWidth', true), 10 ) || 0;
parentOffset.left += num( offsetParent, 'borderLeftWidth' ); parentOffset.left += parseFloat( jQuery.curCSS(offsetParent[0], 'borderLeftWidth', true), 10 ) || 0;
// Subtract the two offsets // Subtract the two offsets
results = { results = {