Ticket #4797: 4797_3.patch

_source/plugins/dialog/plugin.js

@@ -542 +542 @@
 
         CKEDITOR.dialog.prototype =
         {
+                destroy : function()
+                {
+                        this._.element.remove();
+                },
+
                 /**
                  * Resizes the dialog.
                  * @param {Number} width The width of the dialog in pixels.
@@ -658 +663 @@
                         if ( !( element.getParent() && element.getParent().equals( CKEDITOR.document.getBody() ) ) )
                                 element.appendTo( CKEDITOR.document.getBody() );
                         else
-                                return;
+                                element.setStyle( 'display', 'block' );
 
                         // FIREFOX BUG: Fix vanishing caret for Firefox 2 or Gecko 1.8.
                         if ( CKEDITOR.env.gecko && CKEDITOR.env.version < 10900 )
@@ -798 +803 @@
                 {
                         this.fire( 'hide', {} );
                         this._.editor.fire( 'dialogHide', this );
-
-                        // Remove the dialog's element from the root document.
                         var element = this._.element;
-                        if ( !element.getParent() )
-                                return;
-
-                        element.remove();
+                        element.setStyle( 'display', 'none' );
                         this.parts.dialog.setStyle( 'visibility', 'hidden' );
-
                         // Unregister all access keys associated with this dialog.
                         unregisterAccessKey( this );
 
@@ -2779 +2778 @@
                         }
                 };
         })();
+
+        CKEDITOR.on( 'instanceDestroyed', function( evt )
+        {
+                var dialogs = evt.editor._.storedDialogs;
+                for ( var name in dialogs )
+                        dialogs[ name ].destroy();
+
+                // Remove dialog cover on last instance destroy.
+                if ( CKEDITOR.tools.isEmpty( CKEDITOR.instances ) );
+                        coverElement.remove();
+        });
+
 })();
 
 // Extend the CKEDITOR.editor class with dialog specific functions.