Changeset 1057

Timestamp:

11/01/07 10:23:27 (6 years ago)

Author:

martinkou

Message:

Fixed cover block positioning logic to accomodate the possbility that FCKeditor or some of its parents are not static positioned.
Cover block should be added and deleted only when the number of visible dialogs goes from 0 to 1 and from 1 to 0 respectively.

Location:

FCKeditor/branches/features/floating_dialog/editor/_source/internals

Files:

• fck.js (modified) (2 diffs)
• fckdialog.js (modified) (6 diffs)
• fckdomtools.js (modified) (1 diff)

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

@@ -784 +784 @@
                 {
                         var parentDivPosition = FCKTools.GetDocumentPosition( this.Window.parent, editorParentElement ) ;
+                        var positionedAncestor = FCKDomTools.GetPositionedAncestor( this.Window.parent, editorParentElement.parentNode ) ;
+                        var positionedAncestorPosition = positionedAncestor ? 
+                                FCKTools.GetDocumentPosition( this.Window.parent, positionedAncestor ) : 
+                                {'x' : 0, 'y' : 0} ;
                         FCKDomTools.SetElementStyles( this.EditorBlocker,
                                 {
                                         'width' : editorFrame.offsetWidth + 'px',
                                         'height' : editorFrame.offsetHeight + 'px',
-                                        'left' : parentDivPosition.x + 'px',
-                                        'top' : parentDivPosition.y + 'px',
+                                        'left' : ( parentDivPosition.x - positionedAncestorPosition.x ) + 'px',
+                                        'top' : ( parentDivPosition.y - positionedAncestorPosition.y ) + 'px',
                                         'display' : ''
                                 } ) ;
@@ -796 +800 @@
                                         'width' : Math.max( doc.documentElement.scrollWidth, doc.documentElement.clientWidth ) + 'px',
                                         'height' : Math.max( doc.documentElement.scrollHeight, doc.documentElement.clientHeight ) + 'px',
-                                        'left' : '0px',
-                                        'top' : '0px',
+                                        'left' : ( -1 * positionedAncestorPosition.x ) + 'px',
+                                        'top' : ( -1 * positionedAncestorPosition.y ) + 'px',
                                         'display' : ''
                                 } ) ;

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

@@ -25 +25 @@
 {
         BaseZIndex : 10000,
-        LastSelectionData : null
+        LastSelectionData : null,
+        DialogStack : []
 } ;
 
@@ -84 +85 @@
         // 1. The dialog iframe
         // 2. The dialog shadow
+        // 3. The dialog blocker (visible only when the dialog is disabled)
         var container = ownerDocument.createElement( 'div' ) ;
         container.dialogId = dialogId ;
@@ -124 +126 @@
         oWindow.focus() ;
         this.Window = oWindow ;
-        FCK.SetDialogMode( true ) ;
+
+        // Keep record of the current dialog in the dialog stack, and enable dialog mode
+        // if this is the first dialog in the dialog stack.
+        if ( this.DialogStack.length == 0 )
+                FCK.SetDialogMode( true ) ;
+        this.DialogStack.push( container ) ;
 }
 
@@ -186 +193 @@
                 'dialog.shadow.bottom.right.png'
         ];
+        var x = [ 0, 20, container.offsetWidth - 20 ] ;
+        var y = [ 0, 20, container.offsetHeight - 20 ] ;
         for ( var i = 0 ; i < 9 ; i++ )
         {
@@ -201 +210 @@
                         d.style.height = ( container.offsetHeight - 40 ) + 'px' ;
                 FCKDomTools.LoadPNG( d, FCKConfig.SkinPath + 'images/' + partUrl[i] ) ;
-                var x = [ 0, 20, container.offsetWidth - 20 ] ;
-                var y = [ 0, 20, container.offsetHeight - 20 ] ;
                 FCKDomTools.SetElementStyles( d,
                         {
@@ -223 +230 @@
         container.parentNode.removeChild( container ) ;
         this.BaseZIndex -= 100 ;
-        FCK.SetDialogMode( false ) ;
-}
+
+        // Pop the dialog from the dialog stack, and disable dialog mode if the stack is empty.
+        this.DialogStack.pop() ;
+        if ( this.DialogStack.length == 0)
+                FCK.SetDialogMode( false ) ;
+}

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

@@ -914 +914 @@
                 else
                         element.style.opacity = opacity ;
+        },
+
+        GetCurrentElementStyle : function( w, element, attrName )
+        {
+                if ( FCKBrowserInfo.IsIE )
+                        return element.currentStyle[attrName] ;
+                else
+                        return w.getComputedStyle( element, '' )[attrName] ;
+        },
+
+        GetPositionedAncestor : function( w, element )
+        {
+                var currentElement = element ;
+                while ( currentElement != currentElement.ownerDocument.documentElement )
+                {
+                        if ( this.GetCurrentElementStyle( w, currentElement, 'position' ) != 'static' )
+                                return currentElement ;
+                        currentElement = currentElement.parentNode ;
+                }
+                return null ;
         }
 } ;