Ticket #4797: 4797_4.patch

_source/core/tools.js

@@ -691 +691 @@
                                 catch (e) {}
                         }
                         return returnValue;
+                },
+
+                /**
+                 * Generate a combined key from a series of params.
+                 * @param {String} subKey One or more string used as sub keys.
+                 * @example
+                 * var key = CKEDITOR.tools.genKey( 'key1', 'key2', 'key3' );
+                 * alert( key );                // "key1-key2-key3".
+                 */
+                genKey : function()
+                {
+                        return Array.prototype.slice.call( arguments ).join( '-' );
                 }
         };
 })();

_source/plugins/dialog/plugin.js

@@ -545 +545 @@
         {
                 destroy : function()
                 {
+                        this.hide();
                         this._.element.remove();
                 },
 
@@ -698 +699 @@
                         {
                                 CKEDITOR.dialog._.currentTop = this;
                                 this._.parentDialog = null;
-                                addCover( this._.editor );
+                                showCover( this._.editor );
 
                                 element.on( 'keydown', accessKeyDownHandler );
                                 element.on( CKEDITOR.env.opera ? 'keypress' : 'keyup', accessKeyUpHandler );
@@ -711 +712 @@
                         {
                                 this._.parentDialog = CKEDITOR.dialog._.currentTop;
                                 var parentElement = this._.parentDialog.getElement().getFirst();
-                                parentElement.$.style.zIndex  -= Math.floor( this._.editor.config.baseFloatZIndex / 2 );
                                 CKEDITOR.dialog._.currentTop = this;
                         }
 
@@ -802 +802 @@
                  */
                 hide : function()
                 {
+                        if ( !this.parts.dialog.isVisible() )
+                                return;
+
                         this.fire( 'hide', {} );
                         this._.editor.fire( 'dialogHide', this );
                         var element = this._.element;
@@ -810 +813 @@
                         // Unregister all access keys associated with this dialog.
                         unregisterAccessKey( this );
 
+                        // Close any child(top) dialogs first.
+                        while( CKEDITOR.dialog._.currentTop != this )
+                                CKEDITOR.dialog._.currentTop.hide();
+
                         // Maintain dialog ordering and remove cover if needed.
                         if ( !this._.parentDialog )
-                                removeCover();
-                        else
-                        {
-                                var parentElement = this._.parentDialog.getElement().getFirst();
-                                parentElement.setStyle( 'z-index', parseInt( parentElement.$.style.zIndex, 10 ) + Math.floor( this._.editor.config.baseFloatZIndex / 2 ) );
-                        }
+                                hideCover();
+
                         CKEDITOR.dialog._.currentTop = this._.parentDialog;
 
                         // Deduct or clear the z-index.
@@ -845 +848 @@
                         else
                                 CKEDITOR.dialog._.currentZIndex -= 10;
 
-
+                        delete this._.parentDialog;
                         // Reset the initial values of the dialog.
                         this.foreach( function( contentObj ) { contentObj.resetInitValue && contentObj.resetInitValue(); } );
                 },
@@ -1749 +1752 @@
         }
 
         var resizeCover;
-        var coverElement;
+        // Caching resuable covers and allowing only one cover
+        // on screen.
+        var covers = {},
+                currentCover;
 
-        var addCover = function( editor )
+        function showCover( editor )
         {
                 var win = CKEDITOR.document.getWindow();
+                var backgroundColorStyle = editor.config.dialog_backgroundCoverColor || 'white',
+                        baseFloatZIndex = editor.config.baseFloatZIndex,
+                        coverKey = CKEDITOR.tools.genKey( backgroundColorStyle, baseFloatZIndex ),
+                        coverElement = covers[ coverKey ];
 
                 if ( !coverElement )
                 {
-                        var backgroundColorStyle = editor.config.dialog_backgroundCoverColor || 'white';
-
                         var html = [
                                         '<div style="position: ', ( CKEDITOR.env.ie6Compat ? 'absolute' : 'fixed' ),
-                                        '; z-index: ', editor.config.baseFloatZIndex,
+                                        '; z-index: ', baseFloatZIndex,
                                         '; top: 0px; left: 0px; ',
                                         ( !CKEDITOR.env.ie6Compat ? 'background-color: ' + backgroundColorStyle : '' ),
-                                        '" id="cke_dialog_background_cover">'
+                                        '" class="cke_dialog_background_cover">'
                                 ];
 
 
@@ -1803 +1811 @@
                         html.push( '</div>' );
 
                         coverElement = CKEDITOR.dom.element.createFromHtml( html.join( '' ) );
+                        covers[ coverKey ] = coverElement;
                 }
+                else
+                        coverElement.   show();
 
-                var element = coverElement;
-
+                currentCover = coverElement;
                 var resizeFunc = function()
                 {
                         var size = win.getViewPaneSize();
-                        element.setStyles(
+                        coverElement.setStyles(
                                 {
                                         width : size.width + 'px',
                                         height : size.height + 'px'
@@ -1821 +1831 @@
                 {
                         var pos = win.getScrollPosition(),
                                 cursor = CKEDITOR.dialog._.currentTop;
-                        element.setStyles(
+                        coverElement.setStyles(
                                         {
                                                 left : pos.x + 'px',
                                                 top : pos.y + 'px'
@@ -1855 +1865 @@
                 }
 
                 var opacity = editor.config.dialog_backgroundCoverOpacity;
-                element.setOpacity( typeof opacity != 'undefined' ? opacity : 0.5 );
+                coverElement.setOpacity( typeof opacity != 'undefined' ? opacity : 0.5 );
 
-                element.appendTo( CKEDITOR.document.getBody() );
+                coverElement.appendTo( CKEDITOR.document.getBody() );
         };
 
-        var removeCover = function()
+        function hideCover()
         {
-                if ( !coverElement )
+                if ( !currentCover )
                         return;
 
                 var win = CKEDITOR.document.getWindow();
-                coverElement.remove();
+                currentCover.hide();
                 win.removeListener( 'resize', resizeCover );
 
                 if ( CKEDITOR.env.ie6Compat )
@@ -1879 +1889 @@
                 }
                 resizeCover = null;
         };
-
+        
+        function removeCovers()
+        {
+                for ( var coverId in covers )
+                        covers[ coverId ].remove();
+                covers = {};
+        }
+
         var accessKeyProcessors = {};
 
         var accessKeyDownHandler = function( evt )
@@ -2781 +2798 @@
 
         CKEDITOR.on( 'instanceDestroyed', function( evt )
         {
+                // Remove dialog cover on last instance destroy.
+                if ( CKEDITOR.tools.isEmpty( CKEDITOR.instances ) )
+                {
+                        var currentTopDialog;
+                        while ( currentTopDialog = CKEDITOR.dialog._.currentTop )
+                                currentTopDialog.hide();
+                        removeCovers();
+                }
+
                 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();
         });
 
         })();