Changeset 6172

Timestamp:

09/14/07 01:43:46 (1 year ago)

Author:

russellm

Message:

Fixed #5067 -- Fixed a problem with javascript popup widgets appearing in the wrong place if they were in a overflow=scroll block. Thanks to Erich Schmid for the original fix, and Robert Coup for the updated patch.

Files:

• django/trunk/django/contrib/admin/media/js/core.js (modified) (3 diffs)

django/trunk/django/contrib/admin/media/js/core.js

@@ -1 +1 @@
-// Core javascript helper functions
+
+// basic browser identification & version
+var isOpera = (navigator.userAgent.indexOf("Opera")>=0) && parseFloat(navigator.appVersion);
+var isIE = ((document.all) && (!isOpera)) && parseFloat(navigator.appVersion.split("MSIE ")[1].split(";")[0]);
-
-// Cross-browser event handlers.
@@ -72 +76 @@
-    if (obj.offsetParent) {
-        while (obj.offsetParent) {
-
+ - ((isOpera) ? 0 : obj.scrollLeft)
-            obj = obj.offsetParent;
+        }
+        // IE offsetParent does not include the top-level 
+        if (isIE && obj.parentElement){
+            curleft += obj.offsetLeft - obj.scrollLeft;
-        }
-    } else if (obj.x) {
@@ -85 +93 @@
-    if (obj.offsetParent) {
-        while (obj.offsetParent) {
-
+ - ((isOpera) ? 0 : obj.scrollTop)
-            obj = obj.offsetParent;
+        }
+        // IE offsetParent does not include the top-level 
+        if (isIE && obj.parentElement){
+            curtop += obj.offsetTop - obj.scrollTop;
-        }
-    } else if (obj.y) {