Landed a minor fix for AIR (in the offset method).

[jquery.git] / src / offset.js

diff --git a/src/offset.js b/src/offset.js
index e74556c..b29fcc7 100644 (file)
--- a/src/offset.js
+++ b/src/offset.js
@@ -5,11 +5,11 @@ jQuery.fn.offset = function() {
        var left = 0, top = 0, elem = this[0], results;
        
        if ( elem ) with ( jQuery.browser ) {
-               var     parent       = elem.parentNode, 
+               var parent       = elem.parentNode, 
                    offsetChild  = elem,
                    offsetParent = elem.offsetParent, 
                    doc          = elem.ownerDocument,
-                   safari2      = safari && parseInt(version) < 522,
+                   safari2      = safari && parseInt(version) < 522 && !/adobeair/i.test(userAgent),
                    fixed        = jQuery.css(elem, "position") == "fixed";
        
                // Use getBoundingClientRect if available
@@ -17,10 +17,8 @@ jQuery.fn.offset = function() {
                        var box = elem.getBoundingClientRect();
                
                        // Add the document scroll offsets
-                       add(
-                               box.left + Math.max(doc.documentElement.scrollLeft, doc.body.scrollLeft),
-                               box.top  + Math.max(doc.documentElement.scrollTop,  doc.body.scrollTop)
-                       );
+                       add(box.left + Math.max(doc.documentElement.scrollLeft, doc.body.scrollLeft),
+                               box.top  + Math.max(doc.documentElement.scrollTop,  doc.body.scrollTop));
                
                        // IE adds the HTML element's border, by default it is medium which is 2px
                        // IE 6 and 7 quirks mode the border width is overwritable by the following css html { border: 0; }
@@ -35,7 +33,7 @@ jQuery.fn.offset = function() {
                
                        // Initial element offsets
                        add( elem.offsetLeft, elem.offsetTop );
-               
+                       
                        // Get parent offsets
                        while ( offsetParent ) {
                                // Add offsetParent offsets
@@ -57,9 +55,9 @@ jQuery.fn.offset = function() {
                        }
                
                        // Get parent scroll offsets
-                       while ( parent.tagName && !/^body|html$/i.test(parent.tagName) ) {
-                               // Remove parent scroll UNLESS that parent is inline or a table-row to work around Opera inline/table scrollLeft/Top bug
-                               if ( !/^inline|table-row.*$/i.test(jQuery.css(parent, "display")) )
+                       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")) )
                                        // Subtract parent scroll offsets
                                        add( -parent.scrollLeft, -parent.scrollTop );
                        
@@ -74,29 +72,27 @@ 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") != "absoltue") )
+                               (mozilla && jQuery.css(offsetChild, "position") != "absolute") )
                                        add( -doc.body.offsetLeft, -doc.body.offsetTop );
                        
                        // Add the document scroll offsets if position is fixed
                        if ( fixed )
-                               add(
-                                       Math.max(doc.documentElement.scrollLeft, doc.body.scrollLeft),
-                                       Math.max(doc.documentElement.scrollTop,  doc.body.scrollTop)
-                               );
+                               add(Math.max(doc.documentElement.scrollLeft, doc.body.scrollLeft),
+                                       Math.max(doc.documentElement.scrollTop,  doc.body.scrollTop));
                }
 
                // Return an object with top and left properties
                results = { top: top, left: left };
        }
 
-       return results;
-
        function border(elem) {
-               add( jQuery.css(elem, "borderLeftWidth"), jQuery.css(elem, "borderTopWidth") );
+               add( jQuery.curCSS(elem, "borderLeftWidth", true), jQuery.curCSS(elem, "borderTopWidth", true) );
        }
 
        function add(l, t) {
                left += parseInt(l) || 0;
                top += parseInt(t) || 0;
        }
+
+       return results;
 };