Ticket #3389: 3389.patch

_source/plugins/menu/plugin.js

@@ -79 +79 @@
                                         menu = this._.subMenu = new CKEDITOR.menu( this.editor, this._.level + 1 );
                                         menu.parent = this;
                                         menu.onClick = CKEDITOR.tools.bind( this.onClick, this );
+                                        // Sub menu use their own scope for binding onEscape.
+                                        menu.onEscape = this.onEscape;
                                 }
 
                                 // Add all submenu items to the menu.
@@ -125 +127 @@
                                                 },
                                                 this._.level);
 
-                                        panel.onEscape = CKEDITOR.tools.bind( function()
+                                        panel.onEscape = CKEDITOR.tools.bind( function( keystroke )
                                         {
-                                                this.onEscape && this.onEscape();
-                                                this.hide();
+                                                if ( this.onEscape && this.onEscape( keystroke ) === false )
+                                                        return false;
                                         },
                                         this );
 

_source/plugins/contextmenu/plugin.js

@@ -62 +62 @@
                                         menu.onHide = null;
 
                                         noUnlock = true;
-                                        menu.hide();
-
-                                        if ( CKEDITOR.env.ie )
-                                                menu.onEscape();
+                                        menu.onEscape();
 
                                         if ( item.onClick )
                                                 item.onClick();
@@ -75 +72 @@
                                         noUnlock = false;
                                 }, this );
 
-                                menu.onEscape = function()
+                                menu.onEscape = function( keystroke )
                                 {
-                                        editor.focus();
-
-                                        if ( CKEDITOR.env.ie )
-                                                editor.getSelection().unlock( true );
+                                        var parent = this.parent;
+                                        // 1. Close sub menu on ESC/ARROW-RIGHT.
+                                        // 2. Close menu on ESC.
+                                        if( parent )
+                                        {
+                                                parent._.panel.hideChild();
+                                                
+                                                // Restore parent block item focus.
+                                                var parentBlock = parent._.panel._.panel._.currentBlock;
+                                                parentBlock._.markItem( parentBlock._.focusIndex );
+                                                return false;
+                                        }
+                                        else if ( keystroke == 27 )
+                                        {
+                                                this.hide();
+                                                editor.focus();
+        
+                                                if ( CKEDITOR.env.ie )
+                                                        editor.getSelection().unlock( true );
+                                                return false;
+                                        }
                                 };
+                                
                         }
 
                         var listeners = this._.listeners,

_source/plugins/floatpanel/plugin.js

@@ -147 +147 @@
                                         this._.blurSet = 1;
                                 }
 
-                                panel.onEscape = CKEDITOR.tools.bind( function()
+                                panel.onEscape = CKEDITOR.tools.bind( function( keystroke )
                                         {
-                                                this.onEscape && this.onEscape();
+                                                if ( this.onEscape && this.onEscape( keystroke ) === false );
+                                                        return false;
                                         },
                                         this );
 

_source/plugins/panel/plugin.js

@@ -175 +175 @@
                                                         return;
                                                 }
 
-                                                if ( keystroke == 27 )          // ESC
-                                                        this.onEscape && this.onEscape();
+                                                if ( keystroke == 27 || keystroke == 37 )               // ESC/ARROW-LEFT
+                                                        if ( this.onEscape && this.onEscape( keystroke ) === false );
+                                                                evt.data.preventDefault();
                                         },
                                         this );
 
@@ -250 +251 @@
                 this._.focusIndex = -1;
         },
 
-        _ : {},
+        _ : {
+                
+                /**
+                 * Mark the item specified by the index as current activated. 
+                 */
+                markItem: function( index )
+                {
+                        var links = this.element.getElementsByTag( 'a' );
+                        links.getItem( this._.focusIndex = index ).focus();
+                }
+        },
 
         proto :
         {
@@ -313 +324 @@
                                         link = index >= 0 && this.element.getElementsByTag( 'a' ).getItem( index );
 
                                         if ( link )
-                                                link.$.click();
+                                                link.$.click?
+                                                        link.$.click() :  link.$.onclick();
 
                                         return false;
                         }