Made a number of spacing changes to bring the code more-inline with the jQuery Core...

[jquery.git] / src / offset.js

diff --git a/src/offset.js b/src/offset.js
index 3f616ba..6925839 100644 (file)
--- a/src/offset.js
+++ b/src/offset.js
@@ -1,7 +1,17 @@
 if ( "getBoundingClientRect" in document.documentElement ) {
-       jQuery.fn.offset = function() {
+       jQuery.fn.offset = function( options ) {
                var elem = this[0];
-               if ( !elem || !elem.ownerDocument ) { return null; }
+
+               if ( !elem || !elem.ownerDocument ) {
+                       return null;
+               }
+
+               if ( options ) { 
+                       return this.each(function() {
+                               jQuery.offset.setOffset( this, options );
+                       });
+               }
+
                if ( elem === elem.ownerDocument.body ) {
                        return jQuery.offset.bodyOffset( elem );
                }
@@ -10,12 +20,24 @@ if ( "getBoundingClientRect" in document.documentElement ) {
                        clientTop = docElem.clientTop || body.clientTop || 0, clientLeft = docElem.clientLeft || body.clientLeft || 0,
                        top  = box.top  + (self.pageYOffset || jQuery.support.boxModel && docElem.scrollTop  || body.scrollTop ) - clientTop,
                        left = box.left + (self.pageXOffset || jQuery.support.boxModel && docElem.scrollLeft || body.scrollLeft) - clientLeft;
+
                return { top: top, left: left };
        };
+
 } else {
-       jQuery.fn.offset = function() {
+       jQuery.fn.offset = function( options ) {
                var elem = this[0];
-               if ( !elem || !elem.ownerDocument ) { return null; }
+
+               if ( !elem || !elem.ownerDocument ) {
+                       return null;
+               }
+
+               if ( options ) { 
+                       return this.each(function() {
+                               jQuery.offset.setOffset( this, options );
+                       });
+               }
+
                if ( elem === elem.ownerDocument.body ) {
                        return jQuery.offset.bodyOffset( elem );
                }
@@ -25,18 +47,20 @@ if ( "getBoundingClientRect" in document.documentElement ) {
                var offsetParent = elem.offsetParent, prevOffsetParent = elem,
                        doc = elem.ownerDocument, computedStyle, docElem = doc.documentElement,
                        body = doc.body, defaultView = doc.defaultView,
-                       prevComputedStyle = defaultView.getComputedStyle(elem, null),
+                       prevComputedStyle = defaultView ? defaultView.getComputedStyle( elem, null ) : elem.currentStyle,
                        top = elem.offsetTop, left = elem.offsetLeft;
 
                while ( (elem = elem.parentNode) && elem !== body && elem !== docElem ) {
-                       if ( jQuery.offset.supportsFixedPosition && prevComputedStyle.position === "fixed" ) { break; }
+                       if ( jQuery.offset.supportsFixedPosition && prevComputedStyle.position === "fixed" ) {
+                               break;
+                       }
 
-                       computedStyle = defaultView.getComputedStyle(elem, null);
-                       top -= elem.scrollTop;
+                       computedStyle = defaultView ? defaultView.getComputedStyle(elem, null) : elem.currentStyle;
+                       top  -= elem.scrollTop;
                        left -= elem.scrollLeft;
 
                        if ( elem === offsetParent ) {
-                               top += elem.offsetTop;
+                               top  += elem.offsetTop;
                                left += elem.offsetLeft;
 
                                if ( jQuery.offset.doesNotAddBorder && !(jQuery.offset.doesAddBorderForTableAndCells && /^t(able|d|h)$/i.test(elem.nodeName)) ) {
@@ -96,12 +120,11 @@ jQuery.offset = {
                this.doesNotIncludeMarginInBodyOffset = (body.offsetTop !== bodyMarginTop);
 
                body.removeChild( container );
-               jQuery.offset.initialize = function(){};
-
                body = container = innerDiv = checkDiv = table = td = null;
+               jQuery.offset.initialize = function() {};
        },
 
-       bodyOffset: function(body) {
+       bodyOffset: function( body ) {
                var top = body.offsetTop, left = body.offsetLeft;
 
                jQuery.offset.initialize();
@@ -112,13 +135,36 @@ jQuery.offset = {
                }
 
                return { top: top, left: left };
+       },
+       
+       setOffset: function( elem, options ) {
+               // set position first, in-case top/left are set even on static elem
+               if ( /static/.test( jQuery.curCSS( elem, 'position' ) ) ) {
+                       elem.style.position = 'relative';
+               }
+               var curElem   = jQuery( elem ),
+                       curOffset = curElem.offset(),
+                       curTop    = parseInt( jQuery.curCSS( elem, 'top',  true ), 10 ) || 0,
+                       curLeft   = parseInt( jQuery.curCSS( elem, 'left', true ), 10)  || 0,
+                       props     = {
+                               top:  (options.top  - curOffset.top)  + curTop,
+                               left: (options.left - curOffset.left) + curLeft
+                       };
+               
+               if ( 'using' in options ) {
+                       options.using.call( elem, props );
+               } else {
+                       curElem.css( props );
+               }
        }
 };
 
 
 jQuery.fn.extend({
        position: function() {
-               if ( !this[0] ) { return null; }
+               if ( !this[0] ) {
+                       return null;
+               }
 
                var elem = this[0],
 
@@ -147,7 +193,7 @@ jQuery.fn.extend({
        },
 
        offsetParent: function() {
-               return this.map(function(){
+               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;
@@ -159,11 +205,15 @@ jQuery.fn.extend({
 
 
 // Create scrollLeft and scrollTop methods
-jQuery.each( ['Left', 'Top'], function(i, name) {
-       var method = 'scroll' + name;
+jQuery.each( ["Left", "Top"], function( i, name ) {
+       var method = "scroll" + name;
 
        jQuery.fn[ method ] = function(val) {
-               if ( !this[0] ) { return null; }
+               var elem = this[0], win;
+               
+               if ( !elem ) {
+                       return null;
+               }
 
                if ( val !== undefined ) {
                        // Set the scroll offset
@@ -175,28 +225,27 @@ jQuery.each( ['Left', 'Top'], function(i, name) {
                                                !i ? val : jQuery(win).scrollLeft(),
                                                 i ? val : jQuery(win).scrollTop()
                                        );
+
                                } else {
                                        this[ method ] = val;
                                }
                        });
                } else {
-                       var elem = this[0],
-                               win  = getWindow( elem );
+                       win = getWindow( elem );
 
                        // Return the scroll offset
-                       return win && 'pageXOffset' in win ?
-                               win[ i ? 'pageYOffset' : 'pageXOffset' ] ||
-                                       jQuery.support.boxModel && win.document.documentElement[ method ] ||
+                       return win ? ('pageXOffset' in win) ? win[ i ? 'pageYOffset' : 'pageXOffset' ] :
+                               jQuery.support.boxModel && win.document.documentElement[ method ] ||
                                        win.document.body[ method ] :
                                elem[ method ];
                }
        };
-
-       function getWindow( elem ) {
-               return ("scrollTo" in elem && elem.document) ?
-                       elem :
-                       elem.nodeType === 9 ?
-                               elem.defaultView || elem.parentWindow :
-                               false;
-       }
 });
+
+function getWindow( elem ) {
+       return ("scrollTo" in elem && elem.document) ?
+               elem :
+               elem.nodeType === 9 ?
+                       elem.defaultView || elem.parentWindow :
+                       false;
+}