X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Foffset.js;h=9ef5aa02de416107dc5684ab014bd2153e9d418d;hb=f8ef75eb9124ce924be5fb521c783efd5c996e33;hp=c1cfd8610c065dbc676dd94074c2aecc927b222d;hpb=c0cdbf8b946effc4906b4cc96eaf01679b2e6736;p=jquery.git diff --git a/src/offset.js b/src/offset.js index c1cfd86..9ef5aa0 100644 --- a/src/offset.js +++ b/src/offset.js @@ -9,12 +9,12 @@ if ( "getBoundingClientRect" in document.documentElement ) left = box.left + (self.pageXOffset || jQuery.boxModel && docElem.scrollLeft || body.scrollLeft) - clientLeft; return { top: top, left: left }; }; -else +else jQuery.fn.offset = function() { var elem = this[0]; if ( !elem ) return null; if ( elem === elem.ownerDocument.body ) return jQuery.offset.bodyOffset( elem ); - jQuery.offset.initialized || jQuery.offset.initialize(); + jQuery.offset.initialize(); var offsetParent = elem.offsetParent, prevOffsetParent = elem, doc = elem.ownerDocument, computedStyle, docElem = doc.documentElement, @@ -52,7 +52,6 @@ else jQuery.offset = { initialize: function() { - if ( this.initialized ) return; var body = document.body, container = document.createElement('div'), innerDiv, checkDiv, table, td, prop, bodyMarginTop = body.style.marginTop, html = '
'; @@ -77,11 +76,11 @@ jQuery.offset = { body.style.marginTop = bodyMarginTop; body.removeChild(container); - this.initialized = true; + jQuery.offset.initialize = function(){}; }, bodyOffset: function(body) { - jQuery.offset.initialized || jQuery.offset.initialize(); + jQuery.offset.initialize(); var top = body.offsetTop, left = body.offsetLeft; if ( jQuery.offset.doesNotIncludeMarginInBodyOffset ) top += parseFloat( jQuery.curCSS(body, 'marginTop', true), 10 ) || 0, @@ -105,7 +104,7 @@ jQuery.fn.extend({ parentOffset = /^body|html$/i.test(offsetParent[0].tagName) ? { top: 0, left: 0 } : offsetParent.offset(); // 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 offset.top -= parseFloat( jQuery.curCSS(elem, 'marginTop', true), 10 ) || 0; offset.left -= parseFloat( jQuery.curCSS(elem, 'marginLeft', true), 10 ) || 0; @@ -135,7 +134,7 @@ jQuery.fn.extend({ // Create scrollLeft and scrollTop methods jQuery.each( ['Left', 'Top'], function(i, name) { var method = 'scroll' + name; - + jQuery.fn[ method ] = function(val) { if ( !this[0] ) return null;