Ticket #1683: 1683.patch

editor/_source/classes/fckcontextmenu.js

@@ -95 +95 @@
                         if ( el._FCKContextMenu.CtrlDisable && ( e.ctrlKey || e.metaKey ) )
                                 return true ;
 
-                        FCKTools.CancelEvent( e ) ;
-                        FCKContextMenu_AttachedElement_OnContextMenu( e, el._FCKContextMenu, el ) ;
-                        return false ;
+                        var stop =
+                                FCKContextMenu_AttachedElement_OnContextMenu( e, el._FCKContextMenu, el ) ;
+
+                        if ( ! stop )
+                                FCKTools.CancelEvent( e ) ;
+
+                        return stop ;
                 }
                 el = el.parentNode ;
         }
@@ -162 +166 @@
 function FCKContextMenu_AttachedElement_OnContextMenu( ev, fckContextMenu, el )
 {
         if ( fckContextMenu.CtrlDisable && ( ev.ctrlKey || ev.metaKey ) )
+        {
+                fckContextMenu._Panel.Hide( ) ;
                 return true ;
+        }
 
         var eTarget = el || this ;
 
@@ -170 +177 @@
                 fckContextMenu.OnBeforeOpen.call( fckContextMenu, eTarget ) ;
 
         if ( fckContextMenu._MenuBlock.Count() == 0 )
-                return false ;
+        {
+                fckContextMenu._Panel.Hide( ) ;
+                return true ;
+        }
 
         if ( fckContextMenu._Redraw )
         {