Changeset 1131

Timestamp:

11/28/07 09:41:32 (5 years ago)

Author:

fredck

Message:

Fixed #1583 : The hide check proposed in [1111] should not interfere on nested menus.

File:

• FCKeditor/trunk/editor/_source/classes/fckpanel.js (modified) (2 diffs)

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

@@ -164 +164 @@
         else
         {
+                // Do not fire OnBlur while the panel is opened.
+                if ( typeof( FCK.ToolbarSet.CurrentInstance.FocusManager ) != 'undefined' )
+                        FCK.ToolbarSet.CurrentInstance.FocusManager.Lock() ;
+
+                if ( this.ParentPanel )
+                        this.ParentPanel.Lock() ;
+
                 // 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.
-                if ( typeof( FCK.ToolbarSet.CurrentInstance.FocusManager ) != 'undefined' )
-                        FCK.ToolbarSet.CurrentInstance.FocusManager.Lock() ;
-
-                if ( this.ParentPanel )
-                        this.ParentPanel.Lock() ;
 
                 FCKDomTools.SetElementStyles( eMainNode,
@@ -271 +271 @@
         else
         {
-                if ( !this._IsOpened )
+                if ( !this._IsOpened || this._LockCounter > 0 )
                         return ;