Ticket #3881: 3881.patch

_source/plugins/dialog/plugin.js

@@ -2711 +2711 @@
                 /**
                  * 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 )
+                openDialog : function( dialogName, callback )
                 {
                         var dialogDefinitions = CKEDITOR.dialog._.dialogDefinitions[ dialogName ];
 
@@ -2729 +2730 @@
                                 var dialog = storedDialogs[ dialogName ] ||
                                         ( storedDialogs[ dialogName ] = new CKEDITOR.dialog( this, dialogName ) );
 
+                                callback && callback.call( dialog, dialog );
                                 dialog.show();
 
                                 return dialog;
@@ -2747 +2749 @@
                                         // In case of plugin error, mark it as loading failed.
                                         if ( typeof CKEDITOR.dialog._.dialogDefinitions[ dialogName ] != 'function' )
                                                         CKEDITOR.dialog._.dialogDefinitions[ dialogName ] =  'failed';
-                                        me.openDialog( dialogName );
+                                        me.openDialog( dialogName, callback );
                                         body.setStyle( 'cursor', cursor );
                                 } );
 

_source/plugins/colorbutton/plugin.js

@@ -61 +61 @@
                                 {
                                         if ( color == '?' )
                                         {
-                                                // TODO : Implement the colors dialog.
-                                                // editor.openDialog( '' );
+                                                var applyColorStyle = arguments.callee;
+                                                function onColorDialogClose( evt )
+                                                {
+                                                        this.removeListener( 'ok', onColorDialogClose );
+                                                        this.removeListener( 'cancel', onColorDialogClose );
+
+                                                        evt.name == 'ok' && applyColorStyle( this.getContentElement( 'picker', 'selectedColor' ).getValue(), type );
+                                                }
+                                                
+                                                editor.openDialog( 'colordialog', function()
+                                                {
+                                                        this.on( 'ok', onColorDialogClose );
+                                                        this.on( 'cancel', onColorDialogClose );
+                                                } );
+
                                                 return;
                                         }