Changeset 1131


Ignore:
Timestamp:
11/28/2007 09:41:32 AM (8 years ago)
Author:
fredck
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • FCKeditor/trunk/editor/_source/classes/fckpanel.js

    r1130 r1131  
    164164        else
    165165        {
     166                // Do not fire OnBlur while the panel is opened.
     167                if ( typeof( FCK.ToolbarSet.CurrentInstance.FocusManager ) != 'undefined' )
     168                        FCK.ToolbarSet.CurrentInstance.FocusManager.Lock() ;
     169
     170                if ( this.ParentPanel )
     171                        this.ParentPanel.Lock() ;
     172
    166173                // Be sure we'll not have more than one Panel opened at the same time.
    167174                if ( FCKPanel._OpenedPanel )
    168175                        FCKPanel._OpenedPanel.Hide() ;
    169 
    170                 // Do not fire OnBlur while the panel is opened.
    171                 if ( typeof( FCK.ToolbarSet.CurrentInstance.FocusManager ) != 'undefined' )
    172                         FCK.ToolbarSet.CurrentInstance.FocusManager.Lock() ;
    173 
    174                 if ( this.ParentPanel )
    175                         this.ParentPanel.Lock() ;
    176176
    177177                FCKDomTools.SetElementStyles( eMainNode,
     
    271271        else
    272272        {
    273                 if ( !this._IsOpened )
     273                if ( !this._IsOpened || this._LockCounter > 0 )
    274274                        return ;
    275275
Note: See TracChangeset for help on using the changeset viewer.
© 2003 – 2012 CKSource – Frederico Knabben. All rights reserved. | Terms of use | Privacy policy