Ticket #9060: 9060.patch

_source/plugins/dialog/plugin.js

@@ -961 +961 @@
                                 CKEDITOR.dialog._.currentTop.hide();
 
                         // Maintain dialog ordering and remove cover if needed.
+                        // Deduct or clear the z-index.
                         if ( !this._.parentDialog )
+                        {
                                 hideCover();
+                                CKEDITOR.dialog._.currentZIndex = null;
+                        }
                         else
                         {
                                 var parentElement = this._.parentDialog.getElement().getFirst();
                                 parentElement.setStyle( 'z-index', parseInt( parentElement.$.style.zIndex, 10 ) + Math.floor( this._.editor.config.baseFloatZIndex / 2 ) );
+                                CKEDITOR.dialog._.currentZIndex -= 10;
                         }
                         CKEDITOR.dialog._.currentTop = this._.parentDialog;
 
-                        // Deduct or clear the z-index.
-                        if ( !this._.parentDialog )
+                        if ( !this._.parentDialog || ( this._editor != this._.parentDialog._.editor ) )
                         {
-                                CKEDITOR.dialog._.currentZIndex = null;
-
                                 // Remove access key handlers.
                                 element.removeListener( 'keydown', accessKeyDownHandler );
                                 element.removeListener( CKEDITOR.env.opera ? 'keypress' : 'keyup', accessKeyUpHandler );
@@ -992 +994 @@
                                         selection && selection.unlock( true );
                                 }
                         }
-                        else
-                                CKEDITOR.dialog._.currentZIndex -= 10;
 
                         delete this._.parentDialog;
                         // Reset the initial values of the dialog.