Changeset 1091

Timestamp:

2007-11-20 03:34:27 (8 months ago)

Author:

martinkou

Message:

Fixed #1514 : Fixed the issue where popup menus are incorrectly positioned in non-IE browsers when the FCKeditor widget is not static positioned.

Location:

FCKeditor/trunk/editor/_source

Files:

• classes/fckpanel.js (modified) (3 diffs)
• internals/fcktools.js (modified) (1 diff)

FCKeditor/trunk/editor/_source/classes/fckpanel.js

@@ -192 +192 @@
 
                 // Base the popup coordinates upon the coordinates of relElement.
-                var oPos = FCKTools.GetElementPosition(
+                var oPos = FCKTools.GetDocumentPosition( this._Window,
                         relElement.nodeType == 9 ?
                                 ( FCKTools.IsStrictMode( relElement ) ? relElement.documentElement : relElement.body ) :
-                                relElement,
-                        this._Window ) ;
+                                relElement ) ;
 
                 // Minus the offsets provided by any positioned parent element of the panel iframe.
@@ -202 +201 @@
                 if ( positionedAncestor )
                 {
-                        // GetElementPosition() does not work here for some reason... so I'm using GetDocumentPosition() here instead.
                         var nPos = FCKTools.GetDocumentPosition( FCKTools.GetElementWindow( positionedAncestor ), positionedAncestor ) ;
-                        oPos.X -= nPos.x ;
-                        oPos.Y -= nPos.y ;
+                        oPos.x -= nPos.x ;
+                        oPos.y -= nPos.y ;
                 }
 
@@ -211 +209 @@
                         x = ( x * -1 ) ;
 
-                x += oPos.X ;
-                y += oPos.Y ;
+                x += oPos.x ;
+                y += oPos.y ;
 
                 if ( this.IsRTL )

FCKeditor/trunk/editor/_source/internals/fcktools.js

@@ -424 +424 @@
         var y = 0 ;
         var curNode = node ;
-        while ( curNode && curNode != w.document.body )
+        var prevNode = null ;
+        var curWindow = FCKTools.GetElementWindow( curNode ) ;
+        while ( curNode && !( curWindow == w && curNode == w.document.body ) )
         {
                 x += curNode.offsetLeft - curNode.scrollLeft ;
                 y += curNode.offsetTop - curNode.scrollTop ;
-                curNode = curNode.offsetParent ;
-        }
+
+                if ( ! FCKBrowserInfo.IsOpera )
+                {
+                        var scrollNode = prevNode ;
+                        while ( scrollNode && scrollNode != curNode )
+                        {
+                                x -= scrollNode.scrollLeft ;
+                                y -= scrollNode.scrollTop ;
+                                scrollNode = scrollNode.parentNode ;
+                        }
+                }
+
+                prevNode = curNode ;
+                if ( curNode.offsetParent )
+                        curNode = curNode.offsetParent ;
+                else
+                {
+                        if ( curWindow != w )
+                        {
+                                curNode = curWindow.frameElement ;
+                                prevNode = null ;
+                                if ( curNode )
+                                        curWindow = FCKTools.GetElementWindow( curNode ) ;
+                        }
+                        else
+                                curNode = null ;
+                }
+        }
+        x += w.document.body.offsetLeft ;
+        y += w.document.body.offsetTop ;
         return { "x" : x, "y" : y } ;
 }