Ticket #4343: 4343_2.patch

_source/plugins/wysiwygarea/plugin.js

@@ -479 +479 @@
 
                                                 // Adds the document body as a context menu target.
                                                 if ( editor.contextMenu )
-                                                        editor.contextMenu.addTarget( domDocument );
+                                                        editor.contextMenu.addTarget( domDocument, editor.config.browserContextMenuOnCtrl );
 
                                                 setTimeout( function()
                                                         {

_source/plugins/contextmenu/plugin.js

@@ -126 +126 @@
 
         proto :
         {
-                addTarget : function( element )
+                addTarget : function( element, nativeContextMenuOnCtrl )
                 {
                         // Opera doesn't support 'contextmenu' event, we have duo approaches employed here:
                         // 1. Inherit the 'button override' hack we introduced in v2 (#4530), while this require the Opera browser
@@ -147 +147 @@
                                                 return;
                                         }
 
+                                        if ( nativeContextMenuOnCtrl
+                                                 && ( evt.$.ctrlKey || evt.$.metaKey ) )
+                                                return;
+
                                         var target = evt.getTarget();
 
                                         if( !contextMenuOverrideButton )
@@ -179 +183 @@
                                 {
                                         var domEvent = event.data;
 
+                                        if ( nativeContextMenuOnCtrl
+                                                 && ( domEvent.$.ctrlKey || domEvent.$.metaKey ) )
+                                                return;
+
                                         // Cancel the browser context menu.
                                         domEvent.preventDefault();
 
@@ -208 +216 @@
         }
 });
 
+/**
+ * Whether preserve browser native context menu when 'Ctrl' or 'Meta' key
+ * is pressed while open context menu.
+ * @name CKEDITOR.config.browserContextMenuOnCtrl
+ * @type Boolean
+ * @default true
+ * @example
+ *  config.browserContextMenuOnCtrl = false;
+ */