Changeset 12117

Timestamp:

01/21/08 17:14:50 (12 months ago)

Author:

bill

Message:

Modify API doc of dojo._abs() to match behavior on FF.
Modify behavior of dojo_abs() on Safari3 and Opera9 to match behavior on FF.
This fixes popup positioning on safari (fixes #5295).
html.js unit test still passes.
Tested on FF2, FF3, Safari, IE6.
!strict

Files:

• dojo/trunk/_base/html.js (modified) (5 diffs)

dojo/trunk/_base/html.js

@@ -845 +845 @@
         dojo._abs = function(/*DomNode*/node, /*Boolean?*/includeScroll){
                 //      summary:
-                //              Gets the absolute position of the passed element based on the
-                //              document itself. Returns an object of the form:
+                //              Gets the position of the passed element relative to
+                //              the viewport (if includeScroll==false), or relative to the
+                //              document root (if includeScroll==true).
+                //
+                //              Returns an object of the form:
                 //                      { x: 100, y: 300 }
                 //              if includeScroll is passed, the x and y values will include any
@@ -859 +862 @@
                         y: 0
                 };
-                var hasScroll = false;
 
                 // targetBoxType == "border-box"
@@ -876 +878 @@
                 }else{
                         if(node["offsetParent"]){
-                                hasScroll = true;
                                 var endNode;
                                 // in Safari, if the node is an absolutely positioned child of
@@ -893 +894 @@
                                 if(node.parentNode != db){
                                         var nd = node;
-                                        if(dojo.isOpera || (dojo.isSafari >= 3)){ nd = db; }
+                                        if(dojo.isOpera){ nd = db; }
                                         ret.x -= _sumAncestorProperties(nd, "scrollLeft");
                                         ret.y -= _sumAncestorProperties(nd, "scrollTop");
@@ -918 +919 @@
                 // if offsetParent is used, ret value already includes scroll position
                 // so we may have to actually remove that value if !includeScroll
-                if(hasScroll || includeScroll){
+                if(includeScroll){
                         var scroll = dojo._docScroll();
-                        var m = hasScroll ? (!includeScroll ? -1 : 0) : 1;
-                        ret.y += m*scroll.y;
-                        ret.x += m*scroll.x;
+                        ret.y += scroll.y;
+                        ret.x += scroll.x;
                 }