Ticket #3389: 3389_2.patch

_source/plugins/menu/plugin.js

@@ -86 +86 @@
                                         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.
@@ -138 +140 @@
                                                 },
                                                 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 );
 
@@ -186 +188 @@
                                         this._.itemClickFn = CKEDITOR.tools.addFunction( function( index )
                                                 {
                                                         var item = this.items[ index ];
+                                                        // Focus the corresponding block item.
+                                                        var block = this._.panel.getBlock( this.id );
+                                                        block._.markItem( index );
 
                                                         if ( item.state == CKEDITOR.TRISTATE_DISABLED )
                                                         {

_source/plugins/floatpanel/plugin.js

@@ -174 +174 @@
                                         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

@@ -179 +179 @@
                                                         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 );
 
@@ -254 +255 @@
                 this._.focusIndex = -1;
         },
 
-        _ : {},
-
+        _ : {
+                
+                /**
+                 * Mark the item specified by the index as current activated. 
+                 */
+                markItem: function( index )
+                {
+                        if ( index == -1 )
+                                return;
+                        var links = this.element.getElementsByTag( 'a' );
+                        links.getItem( this._.focusIndex = index ).focus();
+                }
+        },
+
         proto :
         {
                 show : function()

_source/plugins/contextmenu/plugin.js

@@ -68 +68 @@
                                         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. If it's submenu, back to upper level.
+                                        // 2. In case of a top level menu, close it.
+                                        if( parent )
+                                        {
+                                                parent._.panel.hideChild();
+                                                
+                                                // Restore parent block item focus.
+                                                var parentBlock = parent._.panel._.panel._.currentBlock,
+                                                        parentFocusIndex =  parentBlock._.focusIndex;
+                                                parentBlock._.markItem( parentFocusIndex );
+                                        }
+                                        else if ( keystroke == 27 )
+                                        {
+                                                this.hide();
+                                                editor.focus();
+        
+                                                if ( CKEDITOR.env.ie )
+                                                        editor.getSelection().unlock( true );
+                                        }
+                                        return false;
                                 };
+                                
                         }
 
                         var listeners = this._.listeners,

CHANGES.html

@@ -138 +138 @@
                 <li>Updated the following language files:<ul>
                         <li><a href="http://dev.fckeditor.net/ticket/3837">#3837</a> : Brazilian Portuguese.</li>
                 </ul>
+                <li><a href="http://dev.fckeditor.net/ticket/3389">#3389</a> : Adding keystrokes for close sub menu.</li>
                 </li>
         </ul>
         <h3>