Changeset 1129

Timestamp:

2007-11-28 08:40:02 (2 years ago)

Author:

martinkou

Message:

Fixed #1583 : Fixed the issue where opening submenus would close their parent menus after [1111].
Fixed #1559 : Fixed the issue where it is possible for two or more unrelated menus to appear simultaneously in FF3 beta.

Location:

FCKeditor/trunk/editor/_source

Files:

• classes/fckpanel.js (modified) (7 diffs)
• internals/fck.js (modified) (3 diffs)

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

@@ -27 +27 @@
         this.IsRTL                      = ( FCKLang.Dir == 'rtl' ) ;
         this.IsContextMenu      = false ;
+        this.PanelListId        = parseInt(Math.random() * 0x100000000);
+        this.ShowTimestamp      = 0 ;
         this._LockCounter       = 0 ;
 
@@ -125 +127 @@
         var iMainWidth ;
         var eMainNode = this.MainNode ;
+        FCK.ToolbarSet.CurrentInstance.OpenedPanels[this.PanelListId] = this ;
+        this.ShowTimestamp = (new Date()).getTime() ;
 
         if ( this._Popup )
@@ -165 +169 @@
         {
                 // Be sure we'll not have more than one Panel opened at the same time.
+                /*
                 if ( FCKPanel._OpenedPanel )
                         FCKPanel._OpenedPanel.Hide() ;
+                */
 
                 // Do not fire OnBlur while the panel is opened.
@@ -257 +263 @@
                 this._IFrame.contentWindow.focus() ;
 
-                FCKPanel._OpenedPanel = this ;
+                //FCKPanel._OpenedPanel = this ;
         }
 
@@ -290 +296 @@
                         FCKTools.RunFunction( this.OnHide, this ) ;
         }
+
+        delete FCK.ToolbarSet.CurrentInstance.OpenedPanels[this.PanelListId] ;
 }
 
@@ -336 +344 @@
 }
 
+function FCKPanel_Global_OnClick( e, panelList )
+{
+        var currentTimestamp = (new Date()).getTime() ;
+        for ( var i in panelList )
+        {
+                // The timestamp check is needed because of a possible race condition,
+                // in which the global onclick handler is called right after FCKPanel.Show().
+                if ( panelList[i].ShowTimestamp < currentTimestamp - 100 )
+                        FCKPanel_Window_OnBlur( e, panelList[i] ) ;
+        }
+}
+
+FCKPanel_Global_OnBlur = FCKPanel_Global_OnClick ;
+
 function CheckPopupOnHide( forceHide )
 {
@@ -353 +375 @@
         this.Document = null ;
         this.MainNode = null ;
-}
+        delete FCK.ToolbarSet.CurrentInstance.OpenedPanels[this.PanelListId] ;
+}

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

@@ -31 +31 @@
         Toolbar                 : null,
         HasFocus                : false,
-        DataProcessor   : new FCKDataProcessor(),
+        DataProcessor           : new FCKDataProcessor(),
+        OpenedPanels            : {},
 
         AttachToOnSelectionChange : function( functionPointer )
@@ -882 +883 @@
         FCKCommands.GetCommand( 'ShowBlocks' ).RestoreState() ;
 
+        FCKTools.AddEventListenerEx( FCK.EditorDocument, 'click', FCKPanel_Global_OnClick, FCK.ToolbarSet.CurrentInstance.OpenedPanels ) ;
+        FCKTools.AddEventListenerEx( FCK.EditorDocument, 'blur', FCKPanel_Global_OnBlur, FCK.ToolbarSet.CurrentInstance.OpenedPanels ) ;
+
         // Check if it is not a startup call, otherwise complete the startup.
         if ( FCK.Status != FCK_STATUS_NOTLOADED )
@@ -888 +892 @@
         if ( FCKConfig.Debug )
                 FCKDebug._GetWindow() ;
+
+        FCKTools.AddEventListenerEx( document, 'click', FCKPanel_Global_OnClick, FCK.ToolbarSet.CurrentInstance.OpenedPanels );
+        FCKTools.AddEventListenerEx( document, 'blur', FCKPanel_Global_OnBlur, FCK.ToolbarSet.CurrentInstance.OpenedPanels ) ;
 
         FCK.SetStatus( FCK_STATUS_ACTIVE ) ;