Ticket #6390: 6390_3.patch

_source/plugins/dialog/plugin.js

@@ -710 +710 @@
                  */
                 show : function()
                 {
-                        var editor = this._.editor;
-                        if ( editor.mode == 'wysiwyg' && CKEDITOR.env.ie )
-                        {
-                                var selection = editor.getSelection();
-                                selection && selection.lock();
-                        }
-
                         // Insert the dialog's element to the root document.
                         var element = this._.element;
                         var definition = this.definition;
@@ -758 +751 @@
                         {
                                 CKEDITOR.dialog._.currentTop = this;
                                 this._.parentDialog = null;
-                                showCover( this._.editor );
 
                                 element.on( 'keydown', accessKeyDownHandler );
                                 element.on( CKEDITOR.env.opera ? 'keypress' : 'keyup', accessKeyUpHandler );
@@ -1852 +1844 @@
                 if ( !coverElement )
                 {
                         var html = [
-                                        '<div style="position: ', ( CKEDITOR.env.ie6Compat ? 'absolute' : 'fixed' ),
+                                        '<div tabIndex="-1" style="position: ', ( CKEDITOR.env.ie6Compat ? 'absolute' : 'fixed' ),
                                         '; z-index: ', baseFloatZIndex,
                                         '; top: 0px; left: 0px; ',
                                         ( !CKEDITOR.env.ie6Compat ? 'background-color: ' + backgroundColorStyle : '' ),
@@ -1933 +1925 @@
                 resizeCover = resizeFunc;
                 win.on( 'resize', resizeFunc );
                 resizeFunc();
+                coverElement.focus();
                 if ( CKEDITOR.env.ie6Compat )
                 {
                         // IE BUG: win.$.onscroll assignment doesn't work.. it must be window.onscroll.
@@ -2896 +2889 @@
         });
 
         })();
-})();
 
-// Extend the CKEDITOR.editor class with dialog specific functions.
-CKEDITOR.tools.extend( CKEDITOR.editor.prototype,
-        /** @lends CKEDITOR.editor.prototype */
-        {
-                /**
-                 * Loads and opens a registered dialog.
-                 * @param {String} dialogName The registered name of the dialog.
-                 * @param {Function} callback The function to be invoked after dialog instance created.
-                 * @see CKEDITOR.dialog.add
-                 * @example
-                 * CKEDITOR.instances.editor1.openDialog( 'smiley' );
-                 * @returns {CKEDITOR.dialog} The dialog object corresponding to the dialog displayed. null if the dialog name is not registered.
-                 */
-                openDialog : function( dialogName, callback )
-                {
-                        var dialogDefinitions = CKEDITOR.dialog._.dialogDefinitions[ dialogName ],
-                                        dialogSkin = this.skin.dialog;
+        // Extend the CKEDITOR.editor class with dialog specific functions.
+        CKEDITOR.tools.extend( CKEDITOR.editor.prototype,
+                /** @lends CKEDITOR.editor.prototype */
+                {
+                        /**
+                         * Loads and opens a registered dialog.
+                         * @param {String} dialogName The registered name of the dialog.
+                         * @param {Function} callback The function to be invoked after dialog instance created.
+                         * @see CKEDITOR.dialog.add
+                         * @example
+                         * CKEDITOR.instances.editor1.openDialog( 'smiley' );
+                         * @returns {CKEDITOR.dialog} The dialog object corresponding to the dialog displayed. null if the dialog name is not registered.
+                         */
+                        openDialog : function( dialogName, callback )
+                        {
+                                if ( this.mode == 'wysiwyg' && CKEDITOR.env.ie )
+                                {
+                                        var selection = this.getSelection();
+                                        selection && selection.lock();
+                                }
+
+                                var dialogDefinitions = CKEDITOR.dialog._.dialogDefinitions[ dialogName ],
+                                                dialogSkin = this.skin.dialog;
 
-                        // If the dialogDefinition is already loaded, open it immediately.
-                        if ( typeof dialogDefinitions == 'function' && dialogSkin._isLoaded )
-                        {
-                                var storedDialogs = this._.storedDialogs ||
-                                        ( this._.storedDialogs = {} );
+                                // If the dialogDefinition is already loaded, open it immediately.
+                                if ( typeof dialogDefinitions == 'function' && dialogSkin._isLoaded )
+                                {
+                                        var storedDialogs = this._.storedDialogs ||
+                                                ( this._.storedDialogs = {} );
 
-                                var dialog = storedDialogs[ dialogName ] ||
-                                        ( storedDialogs[ dialogName ] = new CKEDITOR.dialog( this, dialogName ) );
+                                        var dialog = storedDialogs[ dialogName ] ||
+                                                ( storedDialogs[ dialogName ] = new CKEDITOR.dialog( this, dialogName ) );
 
-                                callback && callback.call( dialog, dialog );
-                                dialog.show();
+                                        callback && callback.call( dialog, dialog );
+                                        dialog.show();
 
-                                return dialog;
-                        }
-                        else if ( dialogDefinitions == 'failed' )
-                                throw new Error( '[CKEDITOR.dialog.openDialog] Dialog "' + dialogName + '" failed when loading definition.' );
+                                        return dialog;
+                                }
+                                else if ( dialogDefinitions == 'failed' )
+                                        throw new Error( '[CKEDITOR.dialog.openDialog] Dialog "' + dialogName + '" failed when loading definition.' );
 
-                        // Not loaded? Load the .js file first.
-                        var body = CKEDITOR.document.getBody(),
-                                cursor = body.$.style.cursor,
-                                me = this;
+                                var me = this;
 
-                        body.setStyle( 'cursor', 'wait' );
-
-                        function onDialogFileLoaded( success )
-                        {
-                                var dialogDefinition = CKEDITOR.dialog._.dialogDefinitions[ dialogName ],
-                                                skin = me.skin.dialog;
+                                function onDialogFileLoaded( success )
+                                {
+                                        var dialogDefinition = CKEDITOR.dialog._.dialogDefinitions[ dialogName ],
+                                                        skin = me.skin.dialog;
 
-                                // Check if both skin part and definition is loaded.
-                                if ( !skin._isLoaded || loadDefinition && typeof success == 'undefined' )
-                                        return;
+                                        // Check if both skin part and definition is loaded.
+                                        if ( !skin._isLoaded || loadDefinition && typeof success == 'undefined' )
+                                                return;
 
-                                // In case of plugin error, mark it as loading failed.
-                                if ( typeof dialogDefinition != 'function' )
-                                        CKEDITOR.dialog._.dialogDefinitions[ dialogName ] = 'failed';
+                                        // In case of plugin error, mark it as loading failed.
+                                        if ( typeof dialogDefinition != 'function' )
+                                                CKEDITOR.dialog._.dialogDefinitions[ dialogName ] = 'failed';
 
-                                me.openDialog( dialogName, callback );
-                                body.setStyle( 'cursor', cursor );
-                        }
+                                        me.openDialog( dialogName, callback );
+                                }
 
-                        if ( typeof dialogDefinitions == 'string' )
-                        {
-                                var loadDefinition = 1;
-                                CKEDITOR.scriptLoader.load( CKEDITOR.getUrl( dialogDefinitions ), onDialogFileLoaded );
-                        }
+                                if ( CKEDITOR.dialog._.currentTop === null )
+                                        showCover( this );
+
+                                if ( typeof dialogDefinitions == 'string' )
+                                {
+                                        var loadDefinition = 1;
+                                        CKEDITOR.scriptLoader.load( CKEDITOR.getUrl( dialogDefinitions ), onDialogFileLoaded, null, 0, 1 );
+                                }
 
-                        CKEDITOR.skins.load( this, 'dialog', onDialogFileLoaded );
+                                CKEDITOR.skins.load( this, 'dialog', onDialogFileLoaded );
 
-                        return null;
-                }
-        });
+                                return null;
+                        }
+                });
+})();
 
 CKEDITOR.plugins.add( 'dialog',
         {