Changeset 1231

Timestamp:

2007-12-20 08:37:42 (10 months ago)

Author:

martinkou

Message:

Improved the floating dialog logic to use the topmost possible window as the base window instead of the first editor instance's parent window.

Location:

FCKeditor/branches/features/floating_dialog/editor

Files:

• fckdialog.html (modified) (5 diffs)
• _source/internals/fckdialog.js (modified) (2 diffs)
• _source/internals/fcktools.js (modified) (1 diff)

FCKeditor/branches/features/floating_dialog/editor/fckdialog.html

@@ -54 +54 @@
                 try
                 {
-                        var parentDomain = window.parent ? window.parent.document.domain : editor.document.domain ;
+                        var parentDomain = args.TopWindow ? args.TopWindow.document.domain : editor.document.domain ;
 
                         if ( document.domain != parentDomain )
@@ -104 +104 @@
         // Connect mousemove and mouseup events from dialog frame and outer window to dialog dragging logic.
         DnD.RegisterHandlers( window ) ;
-        DnD.RegisterHandlers( window.parent ) ;
+        DnD.RegisterHandlers( args.TopWindow ) ;
 
         // Disable the previous dialog if it exists.
@@ -520 +520 @@
                 var retval = { 'x': evt.clientX, 'y': evt.clientY };
 
-                if ( view != window.parent )
-                {
-                        var offset = FCKTools.GetDocumentPosition( window.parent, doc.documentElement ) ;
+                if ( view != args.TopWindow )
+                {
+                        var offset = FCKTools.GetDocumentPosition( args.TopWindow, doc.documentElement ) ;
                         retval.x += offset.x ;
                         retval.y += offset.y ;
@@ -535 +535 @@
                         return ;
 
-                // Debouncing logic for Opera and IE7, for preventing the dialog from vibrating during mouse drags.
-                if ( FCKBrowserInfo.IsOpera || FCKBrowserInfo.IsIE7 )
+                // Debouncing logic for Opera, for preventing the dialog from vibrating during mouse drags.
+                if ( FCKBrowserInfo.IsOpera )
                 {
                         if ( window.LastMoveTimestamp > (new Date()).getTime() - 20 )
@@ -552 +552 @@
                 lastCoords = currentCoords;
 
-                var x = parseInt( FCKDomTools.GetCurrentElementStyle( window.parent, frameElement, 'left' ) ) + dx ;
-                var y = parseInt( FCKDomTools.GetCurrentElementStyle( window.parent, frameElement, 'top' ) ) + dy ;
+                var x = parseInt( FCKDomTools.GetCurrentElementStyle( args.TopWindow, frameElement, 'left' ) ) + dx ;
+                var y = parseInt( FCKDomTools.GetCurrentElementStyle( args.TopWindow, frameElement, 'top' ) ) + dy ;
                 FCKDomTools.SetElementStyles( frameElement,
                                 {

FCKeditor/branches/features/floating_dialog/editor/_source/internals/fckdialog.js

@@ -30 +30 @@
         // The document that holds the dialog.
         var topWindow = window.parent ;
+
+        while ( topWindow.parent && topWindow.parent != topWindow )
+        {
+                try
+                {
+                        if ( topWindow.parent.document.domain != document.domain )
+                                break ;
+                        if ( topWindow.parent.document.getElementsByTagName( 'frameset' ).length > 0 )
+                                break ;
+                }
+                catch ( e )
+                {
+                        break ;
+                }
+                topWindow = topWindow.parent ;
+        }
+
         var topDocument = topWindow.document ;
 
@@ -77 +94 @@
                                 Editor : window,
                                 CustomValue : customValue,              // Optional
-                                SelectionData : null
+                                SelectionData : null,
+                                TopWindow : topWindow
                         }
 

FCKeditor/branches/features/floating_dialog/editor/_source/internals/fcktools.js

@@ -452 +452 @@
                                 prevNode = null ;
                                 if ( curNode )
-                                        curWindow = FCKTools.GetElementWindow( curNode ) ;
+                                        curWindow = curNode.contentWindow.parent ;
                         }
                         else