Ticket #6247: 6247_2.patch

_source/plugins/richcombo/plugin.js

@@ -255 +255 @@
                         panel.onEscape = function()
                                 {
                                         panel.hide();
-                                        me.document.getById( 'cke_' + me.id ).getFirst().getNext().focus();
                                 };
 
                         list.onClick = function( value, marked )

_source/plugins/stylescombo/plugin.js

@@ -96 +96 @@
 
                                                                 combo.commit();
 
-                                                                combo.onOpen();
                                                         });
                                         },
 

_source/plugins/floatpanel/plugin.js

@@ -51 +51 @@
 
                         this._ =
                         {
+                                editor : editor,
                                 // The panel that will be floating.
                                 panel : panel,
                                 parentElement : parentElement,
@@ -102 +103 @@
                                 this.allowBlur( false );
                                 isShowing = 1;
 
+                                // Record from where the focus is when open panel.
+                                this._.returnFocus = this._.editor.focusManager.hasFocus ? this._.editor : new CKEDITOR.dom.element( CKEDITOR.document.$.activeElement );
+
+
                                 var element = this.element,
                                         iframe = this._.iframe,
                                         definition = this._.definition,
@@ -164 +169 @@
                                                                 return;
 
                                                         if ( this.visible && !this._.activeChild && !isShowing )
+                                                        {
+                                                                // Panel close is caused by user's navigating away the focus, e.g. click outside the panel.
+                                                                // DO NOT restore focus in this case.
+                                                                delete this._.returnFocus;
                                                                 this.hide();
+                                                        }
                                                 },
                                                 this );
 
@@ -322 +332 @@
                                         this.element.setStyle( 'display', 'none' );
                                         this.visible = 0;
                                         this.element.getFirst().removeCustomData( 'activePanel' );
-                                }
+
+                                        // Return focus properly. (#6247)
+                                        var focusReturn = this._.returnFocus;
+                                        if ( focusReturn )
+                                        {
+                                                // Webkit requires focus moved out panel iframe first.
+                                                if ( CKEDITOR.env.webkit && focusReturn.type )
+                                                        focusReturn.getWindow().$.focus();
+
+                                                focusReturn.focus();
+                                        }
+                                }
                         },
 
                         allowBlur : function( allow )   // Prevent editor from hiding the panel. #3222.