Changeset 1350

Timestamp:

03/30/08 10:09:00 (7 months ago)

Author:

cederberg@gmail.com

Message:

Fixed #265 by moving the Opera bug fix code to the correct if-block (and removed premature return statement for IE).

Files:

• mochikit/trunk/MochiKit/Style.js (modified) (3 diffs)
• mochikit/trunk/packed/MochiKit/MochiKit.js (modified) (3 diffs)

mochikit/trunk/MochiKit/Style.js

@@ -216 +216 @@
-                (de.clientTop || 0);
-
-            // Don't pass through next steps
-            return c;
-        } else if (elem.offsetParent) {
-            c.x += elem.offsetLeft;
@@ -247 +245 @@
-
-            }
+
+            // Adjust position for strange Opera scroll bug
+            if (elem.parentNode) {
+                parent = elem.parentNode;
+            } else {
+                parent = null;
+            }
+            while (parent) {
+                var tagName = parent.tagName.toUpperCase();
+                if (tagName === 'BODY' || tagName === 'HTML') {
+                    break;
+                }
+                var disp = self.getStyle(parent, 'display');
+                // Handle strange Opera bug for some display
+                if (disp.search(/^inline|table-row.*$/i)) {
+                    c.x -= parent.scrollLeft;
+                    c.y -= parent.scrollTop;
+                }
+                if (parent.parentNode) {
+                    parent = parent.parentNode;
+                } else {
+                    parent = null;
+                }
+            }
-        }
-
@@ -254 +276 @@
-                c.x -= (relativeTo.x || 0);
-                c.y -= (relativeTo.y || 0);
-            }
-        }
-
-        if (elem.parentNode) {
-            parent = elem.parentNode;
-        } else {
-            parent = null;
-        }
-
-        while (parent) {
-            var tagName = parent.tagName.toUpperCase();
-            if (tagName === 'BODY' || tagName === 'HTML') {
-                break;
-            }
-            var disp = self.getStyle(parent, 'display');
-            // Handle strange Opera bug for some display
-            if (disp.search(/^inline|table-row.*$/i)) {
-                c.x -= parent.scrollLeft;
-                c.y -= parent.scrollTop;
-            }
-            if (parent.parentNode) {
-                parent = parent.parentNode;
-            } else {
-                parent = null;
-            }
-        }

mochikit/trunk/packed/MochiKit/MochiKit.js

@@ -3906 +3906 @@
-c.x+=box.left+(de.scrollLeft||b.scrollLeft)-(de.clientLeft||0);
-c.y+=box.top+(de.scrollTop||b.scrollTop)-(de.clientTop||0);
-return c;
-}else{
-if(elem.offsetParent){
@@ -3924 +3923 @@
-c.y-=b.offsetTop;
-}
+if(elem.parentNode){
+_420=elem.parentNode;
+}else{
+_420=null;
+}
+while(_420){
+var _425=_420.tagName.toUpperCase();
+if(_425==="BODY"||_425==="HTML"){
+break;
+}
+var disp=self.getStyle(_420,"display");
+if(disp.search(/^inline|table-row.*$/i)){
+c.x-=_420.scrollLeft;
+c.y-=_420.scrollTop;
+}
+if(_420.parentNode){
+_420=_420.parentNode;
+}else{
+_420=null;
+}
+}
-}
-}
@@ -3932 +3952 @@
-c.x-=(_41b.x||0);
-c.y-=(_41b.y||0);
-}
-}
-if(elem.parentNode){
-_420=elem.parentNode;
-}else{
-_420=null;
-}
-while(_420){
-var _425=_420.tagName.toUpperCase();
-if(_425==="BODY"||_425==="HTML"){
-break;
-}
-var disp=self.getStyle(_420,"display");
-if(disp.search(/^inline|table-row.*$/i)){
-c.x-=_420.scrollLeft;
-c.y-=_420.scrollTop;
-}
-if(_420.parentNode){
-_420=_420.parentNode;
-}else{
-_420=null;
-}
-}