X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Foffset.js;h=0a8b9e64faa100b9441619f3353e2cf04aa47a7e;hb=89dc1e01435ebeef173c9a843096cd5c1fbc9dd8;hp=8caab5315ab04fec792a93f9a90136988242e947;hpb=2adb9b2a0fab55301f66d1a293823ffa6649bdc9;p=jquery.git diff --git a/src/offset.js b/src/offset.js index 8caab53..0a8b9e6 100644 --- a/src/offset.js +++ b/src/offset.js @@ -1,7 +1,7 @@ if ( "getBoundingClientRect" in document.documentElement ) jQuery.fn.offset = function() { var elem = this[0]; - if ( !elem ) return null; + if ( !elem || !elem.ownerDocument ) return null; if ( elem === elem.ownerDocument.body ) return jQuery.offset.bodyOffset( elem ); var box = elem.getBoundingClientRect(), doc = elem.ownerDocument, body = doc.body, docElem = doc.documentElement, clientTop = docElem.clientTop || body.clientTop || 0, clientLeft = docElem.clientLeft || body.clientLeft || 0, @@ -12,7 +12,7 @@ if ( "getBoundingClientRect" in document.documentElement ) else jQuery.fn.offset = function() { var elem = this[0]; - if ( !elem ) return null; + if ( !elem || !elem.ownerDocument ) return null; if ( elem === elem.ownerDocument.body ) return jQuery.offset.bodyOffset( elem ); jQuery.offset.initialize(); @@ -29,13 +29,13 @@ else if ( elem === offsetParent ) { top += elem.offsetTop, left += elem.offsetLeft; if ( jQuery.offset.doesNotAddBorder && !(jQuery.offset.doesAddBorderForTableAndCells && /^t(able|d|h)$/i.test(elem.tagName)) ) - top += parseFloat( computedStyle.borderTopWidth, 10 ) || 0, - left += parseFloat( computedStyle.borderLeftWidth, 10 ) || 0; + top += parseFloat( computedStyle.borderTopWidth ) || 0, + left += parseFloat( computedStyle.borderLeftWidth ) || 0; prevOffsetParent = offsetParent, offsetParent = elem.offsetParent; } if ( jQuery.offset.subtractsBorderForOverflowNotVisible && computedStyle.overflow !== "visible" ) - top += parseFloat( computedStyle.borderTopWidth, 10 ) || 0, - left += parseFloat( computedStyle.borderLeftWidth, 10 ) || 0; + top += parseFloat( computedStyle.borderTopWidth ) || 0, + left += parseFloat( computedStyle.borderLeftWidth ) || 0; prevComputedStyle = computedStyle; } @@ -52,7 +52,7 @@ else jQuery.offset = { initialize: function() { - var body = document.body, container = document.createElement('div'), innerDiv, checkDiv, table, td, bodyMarginTop = parseFloat( jQuery.curCSS(body, 'marginTop', true), 10 ) || 0, + var body = document.body, container = document.createElement('div'), innerDiv, checkDiv, table, td, bodyMarginTop = parseFloat( jQuery.curCSS(body, 'marginTop', true) ) || 0, html = '