Ticket #3831: 3831_2.patch

_source/plugins/contextmenu/plugin.js

@@ -9 +9 @@
 
         beforeInit : function( editor )
         {
+                // Indirect load - disable context menu ( #3831 ).
+                if ( CKEDITOR.tools.indexOf( editor.config.plugins, 'contextmenu' ) < 0 )
+                        return 0;
+
                 editor.contextMenu = new CKEDITOR.plugins.contextMenu( editor );
 
                 editor.addCommand( 'contextMenu',

_source/plugins/menubutton/plugin.js

@@ -5 +5 @@
 
 CKEDITOR.plugins.add( 'menubutton',
 {
-        requires : [ 'button' ],
+        requires : [ 'button', 'contextmenu' ],
         beforeInit : function( editor )
         {
                 editor.ui.addHandler( CKEDITOR.UI_MENUBUTTON, CKEDITOR.ui.menuButton.handler );

CHANGES.html

@@ -46 +46 @@
         <ul>
                 <li><a href="http://dev.fckeditor.net/ticket/3859">#3859</a> : Fixed Flash dialog layout in Webkit</li>
                 <li><a href="http://dev.fckeditor.net/ticket/3852">#3852</a> : Disabled textarea resizing in dialogs</li>
+                <li><a href="http://dev.fckeditor.net/ticket/3831">#3831</a> : Now it is possible to disable contextmenu</li>
                 <li><a href="http://dev.fckeditor.net/ticket/3781">#3781</a> : Colorbutton is now disabled in 'source' mode</li>
                 <li><a href="http://dev.fckeditor.net/ticket/3848">#3848</a> : Fixed an issue with Webkit in witch
                         elements in the Image and Link dialogs had wrong dimensions.</li>