Ticket #3389: 3389_3.patch

_source/plugins/menu/plugin.js

@@ -77 +77 @@
                                         return;
                                 }
 
+                                // Record the focused parent menu item first(#3389). 
+                                var block = this._.panel.getBlock( this.id );
+                                block._.markItem( index );
+
+
                                 // Create the submenu, if not available, or clean the existing
                                 // one.
                                 if ( menu )
@@ -86 +91 @@
                                         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 +145 @@
                                                 },
                                                 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/core/dom/node.js

@@ -25 +25 @@
         {
                 switch ( domNode.nodeType )
                 {
+                        // Safari don't consider document as element node type(#3389).
+                        case CKEDITOR.NODE_DOCUMENT :
+                                return new CKEDITOR.dom.document( domNode );
+
                         case CKEDITOR.NODE_ELEMENT :
                                 return new CKEDITOR.dom.element( domNode );
 
@@ -49 +53 @@
 CKEDITOR.NODE_ELEMENT = 1;
 
 /**
+ * Document node type.
+ * @constant
+ * @example
+ */
+CKEDITOR.NODE_DOCUMENT = 9;
+
+/**
  * Text node type.
  * @constant
  * @example

_source/plugins/listblock/plugin.js

@@ -11 +11 @@
         {
                 CKEDITOR.ui.panel.prototype.addListBlock = function( name, multiSelect )
                 {
-                        return this.addBlock( name, new CKEDITOR.ui.listBlock( this.getHolderElement(), multiSelect ) );
+                        return this.addBlock( name, new CKEDITOR.ui.listBlock( this, this.getHolderElement(), multiSelect ) );
                 };
 
                 CKEDITOR.ui.listBlock = CKEDITOR.tools.createClass(
                         {
                                 base : CKEDITOR.ui.panel.block,
 
-                                $ : function( blockHolder, multiSelect )
+                                $ : function( panel, blockHolder, multiSelect )
                                 {
                                         // Call the base contructor.
-                                        this.base( blockHolder );
+                                        this.base( panel, blockHolder );
 
                                         this.multiSelect = !!multiSelect;
 

_source/plugins/floatpanel/plugin.js

@@ -153 +153 @@
 
                                         focused.on( 'blur', function( ev )
                                                 {
-                                                        if ( CKEDITOR.env.ie && !this.allowBlur() )
+                                                        if ( !this.allowBlur() )
                                                                 return;
 
                                                         // As we are using capture to register the listener,
@@ -163 +163 @@
                                                         var target = ev.data.getTarget(),
                                                                 targetWindow = target.getWindow && target.getWindow();
 
-                                                        if ( targetWindow && targetWindow.equals( focused ) )
+                                                        // Safari always report document as target when window blurred(#3389).
+                                                        if ( ( !CKEDITOR.env.webkit || target.$.nodeType != CKEDITOR.NODE_DOCUMENT )
+                                                                 && targetWindow && targetWindow.equals( focused ) )
                                                                 return;
 
                                                         if ( this.visible && !this._.activeChild && !isShowing )
@@ -184 +186 @@
                                         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

@@ -180 +180 @@
                                                         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 );
 
@@ -198 +199 @@
 
         addBlock : function( name, block )
         {
-                block = this._.blocks[ name ] = block || new CKEDITOR.ui.panel.block( this.getHolderElement() );
+                block = this._.blocks[ name ] = block || new CKEDITOR.ui.panel.block( this, this.getHolderElement() );
 
                 if ( !this._.currentBlock )
                         this.showBlock( name );
@@ -235 +236 @@
 
 CKEDITOR.ui.panel.block = CKEDITOR.tools.createClass(
 {
-        $ : function( blockHolder )
+        $ : function( panel, blockHolder )
         {
                 this.element = blockHolder.append(
                         blockHolder.getDocument().createElement( 'div',
@@ -249 +250 @@
                                                 display : 'none'
                                         }
                                 }) );
-
+                this._.panel = panel;
                 this.keys = {};
 
                 this._.focusIndex = -1;
@@ -259 +260 @@
                         CKEDITOR.plugins.contextMenu.prototype.addDisabledTarget( this.element );
         },
 
-        _ : {},
-
+        _ : {
+                
+                /**
+                 * Mark the item specified by the index as current activated. 
+                 */
+                markItem: function( index )
+                {
+                        if ( index == -1 )
+                                return;
+                        var links = this.element.getElementsByTag( 'a' );
+                        var item = links.getItem( this._.focusIndex = index );
+
+                        // Safari need focus on the iframe window first(#3389), but we need
+                        // lock the blur to avoid hiding the panel.
+                        if ( CKEDITOR.env.webkit )
+                        {
+                                this._.panel.allowBlur = false;
+                                item.getDocument().getWindow().focus();
+                                this._.panel.allowBlur = true;
+                        }
+                        item.focus();
+                }
+        },
+
         proto :
         {
                 show : function()

_source/plugins/contextmenu/plugin.js

@@ -75 +75 @@
                                         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 sub-menu, restore the last focused item
+                                        // of upper level menu.
+                                        // 2. In case of a top-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;
                                 };
                         }