Ticket #6011: 6011_2.patch

_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/contextmenu/plugin.js

@@ -139 +139 @@
                         }
 
                         // Don't show context menu with zero items.
-                        menu.items.length && menu.show( offsetParent, corner || ( editor.lang.dir == 'rtl' ? 2 : 1 ), offsetX, offsetY );
                 }
         },
 

_source/plugins/menubutton/plugin.js

@@ -5 +5 @@
 
 CKEDITOR.plugins.add( 'menubutton',
 {
-        requires : [ 'button', 'contextmenu' ],
+        requires : [ 'button', 'menu' ],
         beforeInit : function( editor )
         {
                 editor.ui.addHandler( CKEDITOR.UI_MENUBUTTON, CKEDITOR.ui.menuButton.handler );
@@ -23 +23 @@
 {
         var clickFn = function( editor )
         {
-                var _ = this._;
+                var _ = this._,
+                        selection;
 
                 // Do nothing if this button is disabled.
                 if ( _.state === CKEDITOR.TRISTATE_DISABLED )
@@ -33 +34 @@
 
                 // Check if we already have a menu for it, otherwise just create it.
                 var menu = _.menu;
-                if ( !menu )
+                
+                if ( menu )
                 {
-                        menu = _.menu = new CKEDITOR.plugins.contextMenu( editor );
-                        menu.definition.panel.attributes[ 'aria-label' ] = editor.lang.common.options;
+                        menu.hide();
+                        menu.removeAll();
+                }
+                else
+                {
+                        menu = _.menu = new CKEDITOR.menu( editor,
+                        {
+                                panel:
+                                {
+                                        className : editor.skinClass,
+                                        attributes : { 'aria-label' : editor.lang.common.options }
+                                }
+                        });
 
                         menu.onHide = CKEDITOR.tools.bind( function()
                                 {
+                                        menu.onHide = null;
+
+                                        if ( CKEDITOR.env.ie )
+                                        {
+                                                var selection = editor.getSelection();
+                                                selection && selection.unlock();
+                                        }
+                                        
                                         this.setState( _.previousState );
                                 },
                                 this );
 
-                        // Initialize the menu items at this point.
-                        if ( this.onMenu )
-                        {
-                                menu.addListener( this.onMenu );
-                        }
-                }
+                        menu.onEscape = function( keystroke )
+                        {
+                                if ( keystroke == 27 )
+                                {
+                                        this.hide();
+                                        editor.focus();
+                                }
+                                return false;
+                        };
+
+                        menu.onClick = CKEDITOR.tools.bind( function( item )
+                        {
+                                menu.hide();
+
+                                if ( item.onClick )
+                                        item.onClick();
+                                else if ( item.command )
+                                        editor.execCommand( item.command );
+
+                        }, this );
+                }
+
+                // Initialize the menu items at this point.
+                if ( this.onMenu )
+                {
+                        var element = selection && selection.getStartElement();
+                        selection = editor.getSelection();
+
+                        var listenerItems = this.onMenu( element, selection );
+
+                        if ( listenerItems )
+                        {
+                                for ( var itemName in listenerItems )
+                                {
+                                        var item = editor.getMenuItem( itemName );
+
+                                        if ( item )
+                                        {
+                                                item.state = listenerItems[ itemName ];
+                                                menu.add( item );
+                                        }
+                                }
+                        }
+                }
 
                 if ( _.on )
                 {
@@ -59 +118 @@
 
                 this.setState( CKEDITOR.TRISTATE_ON );
 
+                // Selection will be unavailable after context menu shows up
+                // in IE, lock it now.
+                if ( CKEDITOR.env.ie )
+                {
+                        selection = editor.getSelection();
+                        selection && selection.lock();
+                }
+                
                 menu.show( CKEDITOR.document.getById( this._.id ), 4 );
         };