Ticket #3373: 3373_4.patch

_source/plugins/contextmenu/plugin.js

@@ -119 +119 @@
                                 }
                         }
 
-                        menu.show( offsetParent, corner || ( editor.lang.dir == 'rtl' ? 2 : 1 ), offsetX, offsetY );
+                        var hasItems = !!menu.items.length;
+
+                        // Don't show context menu with zero items.
+                        hasItems && setTimeout( function ()
+                        {
+                                menu.show( offsetParent, corner || ( editor.lang.dir == 'rtl' ? 2 : 1 ), offsetX, offsetY );
+                        }, 0 );
+
+                        return hasItems;
                 }
         },
 
@@ -131 +139 @@
                                 {
                                         var domEvent = event.data;
 
-                                        // Cancel the browser context menu.
-                                        domEvent.preventDefault();
 
                                         var offsetParent = domEvent.getTarget().getDocument().getDocumentElement(),
                                                 offsetX = domEvent.$.clientX,
                                                 offsetY = domEvent.$.clientY;
 
-                                        CKEDITOR.tools.setTimeout( function()
-                                                {
-                                                        this._.onMenu( offsetParent, null, offsetX, offsetY );
-                                                },
-                                                0, this );
-                                },
+                                        // Cancel the browser context menu only if our menu is actually shown.
+                                        if( this._.onMenu( offsetParent, null, offsetX, offsetY ) )
+                                                domEvent.preventDefault();
+                                },
                                 this );
                 },