Ticket #1838: 1838.patch

_whatsnew.html

@@ -58 +58 @@
                         mode.</li>
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1934">#1934</a>] Fixed
                         JavaScript errors when calling Selection.EnsureSelection() in dialogs.</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1838">#1838</a>] Fixed the
+                        issue where context menus sometimes don't disappear after selecting an option.
+                        </li>
         </ul>
         <h3>
                 Version 2.6 Beta 1</h3>

editor/_source/classes/fckpanel.js

@@ -270 +270 @@
                                 top             : y + 'px'
                         } ) ;
 
+                // Move the focus to the IFRAME so we catch the "onblur".
+                this._IFrame.width = this._IFrame.height = 2 ;
+                this._IFrame.contentWindow.focus() ;
+                this._IsOpened = true ;
+
+                // Fix for #1514: The color panels are sometimes too small when they're opened.
+                // A delayed resize is needed to get the correct sizes.
                 var me = this ;
                 var resizeFunc = function()
                 {
@@ -277 +284 @@
                         var iHeight = eMainNode.offsetHeight ;
                         me._IFrame.width = iWidth ;
                         me._IFrame.height = iHeight ;
-
-                        // Move the focus to the IFRAME so we catch the "onblur".
-                        me._IFrame.contentWindow.focus() ;
-                        me._IsOpened = true ;
+                        me._resizeTimer = null ;
                 }
-                setTimeout( resizeFunc, 1 ) ;
+                this._resizeTimer = setTimeout( resizeFunc, 1 ) ;
 
                 FCK.ToolbarSet.CurrentInstance.GetInstanceObject( 'FCKPanel' )._OpenedPanel = this ;
         }
@@ -308 +312 @@
                 this._IFrame.width = this._IFrame.height = 0 ;
 
                 this._IsOpened = false ;
+                if ( this._resizeTimer )
+                {
+                        clearTimeout( this._resizeTimer ) ;
+                        this._resizeTimer = null ;
+                }
 
                 if ( this.ParentPanel )
                         this.ParentPanel.Unlock() ;