Ticket #3085: 3085_5.patch

_source/plugins/contextmenu/plugin.js

@@ -10 +10 @@
         beforeInit : function( editor )
         {
                 editor.contextMenu = new CKEDITOR.plugins.contextMenu( editor );
+
+                editor.addCommand( 'contextMenu',
+                        {
+                                exec : function()
+                                        {
+                                                editor.contextMenu.show();
+                                        }
+                        });
         }
 });
 
@@ -31 +39 @@
 
         _ :
         {
-                onMenu : function( domEvent )
+                onMenu : function( offsetParent, offsetX, offsetY )
                 {
-                        // Cancel the browser context menu.
-                        domEvent.preventDefault();
-
                         var menu = this._.menu,
                                 editor = this.editor;
 
@@ -47 +52 @@
                         else
                         {
                                 menu = this._.menu = new CKEDITOR.menu( editor );
-                                menu.onClick = function( item )
+                                menu.onClick = CKEDITOR.tools.bind( function( item )
                                 {
                                         menu.hide();
                                         editor.focus();
@@ -55 +60 @@
                                         if ( item.onClick )
                                                 item.onClick();
                                         else if ( item.command )
+                                        {
+                                                if ( CKEDITOR.env.ie )
+                                                        this.restoreSelection();
+
                                                 editor.execCommand( item.command );
+                                        }
+                                }, this );
+
+                                menu.onEscape = function()
+                                {
+                                        editor.focus();
                                 };
                         }
 
@@ -85 +100 @@
                                 }
                         }
 
-                        menu.show( domEvent.getTarget().getDocument().getDocumentElement(), 1, domEvent.$.clientX, domEvent.$.clientY );
+                        if ( CKEDITOR.env.ie )
+                                this.saveSelection();
+
+                        menu.show( offsetParent, 1, offsetX, offsetY );
                 }
         },
 
@@ -95 +113 @@
                 {
                         element.on( 'contextmenu', function( event )
                                 {
-                                        return this._.onMenu( event.data );
+                                        var domEvent = event.data;
+
+                                        // Cancel the browser context menu.
+                                        domEvent.preventDefault();
+
+                                        var offsetParent = domEvent.getTarget().getDocument().getDocumentElement();
+                                                offsetX = domEvent.$.clientX,
+                                                offsetY = domEvent.$.clientY;
+
+                                        CKEDITOR.tools.setTimeout( function()
+                                                {
+                                                        this._.onMenu( offsetParent, offsetX, offsetY );
+                                                },
+                                                0, this );
                                 },
                                 this );
                 },
@@ -103 +134 @@
                 addListener : function( listenerFn )
                 {
                         this._.listeners.push( listenerFn );
+                },
+
+                show : function()
+                {
+                        this.editor.focus();
+                        this._.onMenu( CKEDITOR.document.getDocumentElement(), 0, 0 );
+                },
+                
+                /**
+                 * Saves the current selection position in the editor.
+                 */
+                saveSelection : function()
+                {
+                        if ( this.editor.mode == 'wysiwyg' )
+                        {
+                                this.editor.focus();
+
+                                var selection = new CKEDITOR.dom.selection( this.editor.document );
+                                this._.selectedRanges = selection.getRanges();
+                        }
+                        else
+                                delete this._.selectedRanges;
+                },
+
+                /**
+                 * Restores the editor's selection from the previously saved position in this
+                 * dialog.
+                 */
+                restoreSelection : function()
+                {
+                        if ( this.editor.mode == 'wysiwyg' && this._.selectedRanges )
+                        {
+                                this.editor.focus();
+                                ( new CKEDITOR.dom.selection( this.editor.document ) ).selectRanges( this._.selectedRanges );
+                        }
                 }
         }
 });

_source/plugins/keystrokes/plugin.js

@@ -172 +172 @@
         [ CKEDITOR.ALT + 121 /*F10*/, 'toolbarFocus' ],
         [ CKEDITOR.ALT + 122 /*F11*/, 'elementsPathFocus' ],
 
+        [ CKEDITOR.SHIFT + 121 /*F10*/, 'contextMenu' ],
+
         [ CKEDITOR.CTRL + 90 /*Z*/, 'undo' ],
         [ CKEDITOR.CTRL + 89 /*Y*/, 'redo' ],
         [ CKEDITOR.CTRL + CKEDITOR.SHIFT + 90 /*Z*/, 'redo' ],

_source/plugins/menu/plugin.js

@@ -125 +125 @@
                                                 },
                                                 this._.level);
 
+                                        panel.onEscape = CKEDITOR.tools.bind( function()
+                                        {
+                                                this.hide();
+                                                this.onEscape && this.onEscape();
+                                        },
+                                        this );
+
                                         // Create an autosize block inside the panel.
                                         var block = panel.addBlock( this.id );
                                         block.autoSize = true;
 
+                                        var keys = block.keys;
+                                        keys[ 40 ]      = 'next';                                       // ARROW-DOWN
+                                        keys[ 9 ]       = 'next';                                       // TAB
+                                        keys[ 38 ]      = 'prev';                                       // ARROW-UP
+                                        keys[ CKEDITOR.SHIFT + 9 ]      = 'prev';       // SHIFT + TAB
+                                        keys[ 32 ]      = 'click';                                      // SPACE
+                                        keys[ 39 ]      = 'click';                                      // ARROW-RIGHT
+
                                         element = this._.element = block.element;
                                         element.addClass( editor.skinClass );
                                         element.getDocument().getBody().setStyle( 'overflow', 'hidden' );
@@ -253 +268 @@
                                         ' class="', classes, '" href="javascript:void(\'', ( this.label || '' ).replace( "'", '' ), '\')"' +
                                         ' title="', this.label, '"' +
                                         ' tabindex="-1"' +
+                                        '_cke_focus=1' + 
                                         ' hidefocus="true"' );
 
                         // Some browsers don't cancel key events in the keydown but in the

_source/skins/default/menu.css

@@ -14 +14 @@
 }
 
 .cke_skin_default .cke_menuitem a:hover,
-.cke_skin_default .cke_menuitem a:focus
+.cke_skin_default .cke_menuitem a:focus,
+.cke_skin_default .cke_menuitem a:active
 {
         background-color: #8f8f73;
         display:block;
@@ -41 +42 @@
 }
 
 .cke_skin_default .cke_menuitem a:hover .cke_icon,
-.cke_skin_default .cke_menuitem a:focus .cke_icon
+.cke_skin_default .cke_menuitem a:focus .cke_icon,
+.cke_skin_default .cke_menuitem a:active .cke_icon
 {
         background-color: #737357;
         border: solid 4px #737357;
@@ -60 +62 @@
 }
 
 .cke_skin_default .cke_menuitem a:hover .cke_label,
-.cke_skin_default .cke_menuitem a:focus .cke_label
+.cke_skin_default .cke_menuitem a:focus .cke_label,
+.cke_skin_default .cke_menuitem a:active .cke_label
 {
         color: #fff;
         background-color: #8f8f73;