Ticket #7175: 7175_2.patch

_source/plugins/floatpanel/plugin.js

@@ -101 +101 @@
                                         block = panel.showBlock( name );
 
                                 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 );
@@ -166 +165 @@
                                                         if ( target.getName && target.getName() != 'iframe' )
                                                                 return;
 
-                                                        if ( this.visible && !this._.activeChild && !isShowing )
+                                                        if ( this.visible && !this._.activeChild )
                                                         {
                                                                 // Panel close is caused by user's navigating away the focus, e.g. click outside the panel.
                                                                 // DO NOT restore focus in this case.
@@ -302 +301 @@
                                                                         left : left + 'px'
                                                                 } );
                                                         element.setOpacity( 1 );
-                                                } , this );
 
+                                                // Necessary buffer time for IE to move focus into the iframe when host page is in a modal dialog. (#7175)
+                                                CKEDITOR.tools.setTimeout( function() { iframe.$.contentWindow.focus(); },
+                                                        CKEDITOR.env.ie && window.dialogArguments !== undefined ? 100 : 0 );
+
+                                                } , this );
                                                 panel.isLoaded ? panelLoad() : panel.onLoad = panelLoad;
 
-                                                // Set the panel frame focus, so the blur event gets fired.
-                                                CKEDITOR.tools.setTimeout( function()
-                                                {
-                                                        iframe.$.contentWindow.focus();
-                                                        // We need this get fired manually because of unfired focus() function.
-                                                        this.allowBlur( true );
-                                                }, 0, this);
                                         },  CKEDITOR.env.air ? 200 : 0, this);
                                 this.visible = 1;
 
                                 if ( this.onShow )
                                         this.onShow.call( this );
 
-                                isShowing = 0;
                         },
 
                         hide : function( returnFocus )