Ticket #6011: 6011.patch

_source/plugins/liststyle/plugin.js

@@ -7 +7 @@
 {
         CKEDITOR.plugins.liststyle =
         {
-                requires : [ 'dialog' ],
+                requires : [ 'dialog', 'menu' ],
                 init : function( editor )
                 {
                         editor.addCommand( 'numberedListStyle', new CKEDITOR.dialogCommand( 'numberedListStyle' ) );

_source/plugins/clipboard/plugin.js

@@ -284 +284 @@
         // Register the plugin.
         CKEDITOR.plugins.add( 'clipboard',
                 {
-                        requires : [ 'dialog', 'htmldataprocessor' ],
+                        requires : [ 'htmldataprocessor' ],
                         init : function( editor )
                         {
                                 // Inserts processed data into the editor at the end of the
@@ -304 +304 @@
                                                 setTimeout( function()
                                                 {
                                                         // Open default paste dialog.
-                                                        editor.openDialog( 'paste' );
+                                                        editor.openDialog && editor.openDialog( 'paste' );
                                                 }, 0 );
                                         });
 
@@ -336 +336 @@
                                 addButtonCommand( 'Copy', 'copy', new cutCopyCmd( 'copy' ), 4 );
                                 addButtonCommand( 'Paste', 'paste', pasteCmd, 8 );
 
-                                CKEDITOR.dialog.add( 'paste', CKEDITOR.getUrl( this.path + 'dialogs/paste.js' ) );
+                                // Add dialog if plugin is available.
+                                if ( CKEDITOR.dialog )
+                                        CKEDITOR.dialog.add( 'paste', CKEDITOR.getUrl( this.path + 'dialogs/paste.js' ) );
 
                                 editor.on( 'key', onKey, editor );
 

_source/plugins/pastetext/plugin.js

@@ -27 +27 @@
 
                         if ( !clipboardText )   // Clipboard access privilege is not granted.
                         {
-                                editor.openDialog( 'pastetext' );
+                                editor.openDialog && editor.openDialog( 'pastetext' );
                                 return false;
                         }
                         else
@@ -65 +65 @@
                                         command : commandName
                                 });
 
-                        CKEDITOR.dialog.add( commandName, CKEDITOR.getUrl( this.path + 'dialogs/pastetext.js' ) );
+                        // Add dialog if plugin is available.
+                        if ( CKEDITOR.dialog )
+                                CKEDITOR.dialog.add( commandName, CKEDITOR.getUrl( this.path + 'dialogs/pastetext.js' ) );
 
                         if ( editor.config.forcePasteAsPlainText )
                         {

_source/plugins/menubutton/plugin.js

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