Ticket #6247: 6247.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/floatpanel/plugin.js

@@ -100 +100 @@
                                         block = panel.showBlock( name );
 
                                 this.allowBlur( false );
+
+                                // Record from where the focus is when open panel.
+                                this._.returnFocus = new CKEDITOR.dom.element( CKEDITOR.document.$.activeElement );
+
                                 isShowing = 1;
 
                                 var element = this.element,
@@ -164 +168 @@
                                                                 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 +331 @@
                                         this.element.setStyle( 'display', 'none' );
                                         this.visible = 0;
                                         this.element.getFirst().removeCustomData( 'activePanel' );
+
+                                        // Return focus properly. (#6247)
+                                        var focusReturn = this._.returnFocus;
+                                        focusReturn && ( focusReturn.is( 'iframe' ) ? focusReturn.getFrameDocument().getWindow() : focusReturn ).focus();
                                 }
                         },