Ticket #4369: 4369.patch

_source/plugins/contextmenu/plugin.js

@@ -35 +35 @@
                                 editor.execCommand( commandName );
                         },
                         this);
-
-                        // Disable context menu for top and bottom editor's UI parts.
-                        var self = this;
-                        editor.on( 'themeLoaded', function()
-                                {
-                                        self.addDisabledTarget( this.container );
-                                } );
         },
 
         _ :
@@ -154 +147 @@
                                 this );
                 },
 
-                addDisabledTarget : function( element )
-                {
-                        element.on( 'contextmenu', function( event )
-                                {
-                                        // Cancel the browser context menu.
-                                        if ( !event.data.getTarget().hasClass( 'cke_enable_context_menu' ) )
-                                                event.data.preventDefault();
-                                } );
-                },
-
                 addListener : function( listenerFn )
                 {
                         this._.listeners.push( listenerFn );

_source/themes/default/theme.js

@@ -86 +86 @@
                          */
                         editor.container = container;
 
+                        // Disable browser context menu for editor's chrome.
+                        container.disableContextMenu();
+
                         editor.fireOnce( 'themeLoaded' );
                         editor.fireOnce( 'uiReady' );
                 },

_source/core/dom/element.js

@@ -1380 +1380 @@
                 getChildCount : function()
                 {
                         return this.$.childNodes.length;
-                }
+                },
+
+                disableContextMenu : function()
+                {
+                        this.on( 'contextmenu', function( event )
+                                {
+                                        // Cancel the browser context menu.
+                                        if ( !event.data.getTarget().hasClass( 'cke_enable_context_menu' ) )
+                                                event.data.preventDefault();
+                                } );
+                }
         });