X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Foffset.js;h=3f616baa1e9192c48499c4c13b726ef1c38a0da5;hb=ec7fdf37235583a807b3f08e146edaadc81ca974;hp=dab0c2bfc78796715c2531c743ced8225e866291;hpb=f0681d98fe1fcb2995eca50a41c1c66407eab97a;p=jquery.git diff --git a/src/offset.js b/src/offset.js index dab0c2b..3f616ba 100644 --- a/src/offset.js +++ b/src/offset.js @@ -39,7 +39,7 @@ if ( "getBoundingClientRect" in document.documentElement ) { 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.nodeName)) ) { top += parseFloat( computedStyle.borderTopWidth ) || 0; left += parseFloat( computedStyle.borderLeftWidth ) || 0; } @@ -127,7 +127,7 @@ jQuery.fn.extend({ // Get correct offsets offset = this.offset(), - parentOffset = /^body|html$/i.test(offsetParent[0].tagName) ? { top: 0, left: 0 } : offsetParent.offset(); + parentOffset = /^body|html$/i.test(offsetParent[0].nodeName) ? { top: 0, left: 0 } : offsetParent.offset(); // Subtract element margins // note: when an element has margin: auto the offsetLeft and marginLeft @@ -147,11 +147,13 @@ jQuery.fn.extend({ }, offsetParent: function() { - var offsetParent = this[0].offsetParent || document.body; - while ( offsetParent && (!/^body|html$/i.test(offsetParent.tagName) && jQuery.css(offsetParent, 'position') === 'static') ) { - offsetParent = offsetParent.offsetParent; - } - return jQuery( offsetParent ); + return this.map(function(){ + var offsetParent = this.offsetParent || document.body; + while ( offsetParent && (!/^body|html$/i.test(offsetParent.nodeName) && jQuery.css(offsetParent, 'position') === 'static') ) { + offsetParent = offsetParent.offsetParent; + } + return offsetParent; + }); } });