Merged dimensions with core

[jquery.git] / src / offset.js

diff --git a/src/offset.js b/src/offset.js
index cf1af33..23923c3 100644 (file)
--- a/src/offset.js
+++ b/src/offset.js
@@ -9,8 +9,9 @@ jQuery.fn.offset = function() {
                    offsetChild  = elem,
                    offsetParent = elem.offsetParent, 
                    doc          = elem.ownerDocument,
-                   safari2      = safari && parseInt(version) < 522,
-                   fixed        = jQuery.css(elem, "position") == "fixed";
+                   safari2      = safari && parseInt(version) < 522 && !/adobeair/i.test(userAgent),
+                   css          = jQuery.curCSS,
+                   fixed        = css(elem, "position") == "fixed";
        
                // Use getBoundingClientRect if available
                if ( elem.getBoundingClientRect ) {
@@ -45,7 +46,7 @@ jQuery.fn.offset = function() {
                                        border( offsetParent );
                                        
                                // Add the document scroll offsets if position is fixed on any offsetParent
-                               if ( !fixed && jQuery.css(offsetParent, "position") == "fixed" )
+                               if ( !fixed && css(offsetParent, "position") == "fixed" )
                                        fixed = true;
                        
                                // Set offsetChild to previous offsetParent unless it is the body element
@@ -55,14 +56,14 @@ jQuery.fn.offset = function() {
                        }
                
                        // Get parent scroll offsets
-                       while ( parent.tagName && !/^body|html$/i.test(parent.tagName) ) {
+                       while ( parent && parent.tagName && !/^body|html$/i.test(parent.tagName) ) {
                                // Remove parent scroll UNLESS that parent is inline or a table to work around Opera inline/table scrollLeft/Top bug
-                               if ( !/^inline|table.*$/i.test(jQuery.css(parent, "display")) )
+                               if ( !/^inline|table.*$/i.test(css(parent, "display")) )
                                        // Subtract parent scroll offsets
                                        add( -parent.scrollLeft, -parent.scrollTop );
                        
                                // Mozilla does not add the border for a parent that has overflow != visible
-                               if ( mozilla && jQuery.css(parent, "overflow") != "visible" )
+                               if ( mozilla && css(parent, "overflow") != "visible" )
                                        border( parent );
                        
                                // Get next parent
@@ -71,8 +72,8 @@ jQuery.fn.offset = function() {
                
                        // Safari <= 2 doubles body offsets with a fixed position element/offsetParent or absolutely positioned offsetChild
                        // Mozilla doubles body offsets with a non-absolutely positioned offsetChild
-                       if ( (safari2 && (fixed || jQuery.css(offsetChild, "position") == "absolute")) || 
-                               (mozilla && jQuery.css(offsetChild, "position") != "absolute") )
+                       if ( (safari2 && (fixed || css(offsetChild, "position") == "absolute")) || 
+                               (mozilla && css(offsetChild, "position") != "absolute") )
                                        add( -doc.body.offsetLeft, -doc.body.offsetTop );
                        
                        // Add the document scroll offsets if position is fixed
@@ -96,3 +97,69 @@ jQuery.fn.offset = function() {
 
        return results;
 };
+
+
+jQuery.fn.extend({
+       position: function() {
+               var left = 0, top = 0, elem = this[0], offset, parentOffset, offsetParent, results;
+               
+               if (elem) {
+                       // Get *real* offsetParent
+                       offsetParent = this.offsetParent();
+                       
+                       // Get correct offsets
+                       offset       = this.offset();
+                       parentOffset = offsetParent.offset();
+                       
+                       // Subtract element margins
+                       offset.top  -= parseInt( jQuery.curCSS(elem, 'marginTop', true) ) || 0;
+                       offset.left -= parseInt( jQuery.curCSS(elem, 'marginLeft', true) ) || 0;
+                       
+                       // Add offsetParent borders
+                       parentOffset.top  += parseInt( jQuery.curCSS(offsetParent[0], 'borderTopWidth', true) ) || 0;
+                       parentOffset.left += parseInt( jQuery.curCSS(offsetParent[0], 'borderLeftWidth', true) ) || 0;
+                       
+                       // Subtract the two offsets
+                       results = {
+                               top:  offset.top  - parentOffset.top,
+                               left: offset.left - parentOffset.left
+                       };
+               }
+               
+               return results;
+       },
+       
+       offsetParent: function() {
+               var offsetParent = this[0].offsetParent;
+               while ( offsetParent && (!/^body|html$/i.test(offsetParent.tagName) && jQuery.css(offsetParent, 'position') == 'static') )
+                       offsetParent = offsetParent.offsetParent;
+               return jQuery(offsetParent);
+       }
+});
+
+
+// Create scrollLeft and scrollTop methods
+jQuery.each( ['Left', 'Top'], function(i, name) {
+       jQuery.fn[ 'scroll' + name ] = function(val) {
+               if (!this[0]) return;
+               
+               return val != undefined ?
+               
+                       // Set the scroll offset
+                       this.each(function() {
+                               this == window || this == document ?
+                                       window.scrollTo( 
+                                               name == 'Left' ? val : jQuery(window)[ 'scrollLeft' ](),
+                                               name == 'Top'  ? val : jQuery(window)[ 'scrollTop'  ]()
+                                       ) :
+                                       this[ 'scroll' + name ] = val;
+                       }) :
+                       
+                       // Return the scroll offset
+                       this[0] == window || this[0] == document ?
+                               self[ (name == 'Left' ? 'pageXOffset' : 'pageYOffset') ] ||
+                                       jQuery.boxModel && document.documentElement[ 'scroll' + name ] ||
+                                       document.body[ 'scroll' + name ] :
+                               this[0][ 'scroll' + name ];
+       };
+});
\ No newline at end of file