remove trailing spaces

[jquery.git] / src / offset.js

diff --git a/src/offset.js b/src/offset.js
index bca01d7..9ef5aa0 100644 (file)
--- 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,
@@ -23,6 +23,7 @@ else
                        top = elem.offsetTop, left = elem.offsetLeft;
 
                while ( (elem = elem.parentNode) && elem !== body && elem !== docElem ) {
+                       if ( jQuery.offset.supportsFixedPosition && prevComputedStyle.position === "fixed" ) break;
                        computedStyle = defaultView.getComputedStyle(elem, null);
                        top -= elem.scrollTop, left -= elem.scrollLeft;
                        if ( elem === offsetParent ) {
@@ -42,7 +43,7 @@ else
                        top  += body.offsetTop,
                        left += body.offsetLeft;
 
-               if ( prevComputedStyle.position === "fixed" )
+               if ( jQuery.offset.supportsFixedPosition && prevComputedStyle.position === "fixed" )
                        top  += Math.max(docElem.scrollTop, body.scrollTop),
                        left += Math.max(docElem.scrollLeft, body.scrollLeft);
 
@@ -51,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 = '<div style="position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;"><div></div></div><table style="position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;" cellpadding="0" cellspacing="0"><tr><td></td></tr></table>';
 
@@ -64,6 +64,10 @@ jQuery.offset = {
                this.doesNotAddBorder = (checkDiv.offsetTop !== 5);
                this.doesAddBorderForTableAndCells = (td.offsetTop === 5);
 
+               checkDiv.style.position = 'fixed', checkDiv.style.top = '20px';
+               this.supportsFixedPosition = (checkDiv.offsetTop >= 15); // safari subtracts parent border width here which is 5px
+               checkDiv.style.position = '', checkDiv.style.top = '';
+
                innerDiv.style.overflow = 'hidden', innerDiv.style.position = 'relative';
                this.subtractsBorderForOverflowNotVisible = (checkDiv.offsetTop === -5);
 
@@ -72,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,
@@ -100,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;
@@ -130,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;