Ticket #4445: 4445_2.patch

_source/plugins/wysiwygarea/plugin.js

@@ -466 +466 @@
                                                                         editor.focus();
                                                                         isPendingFocus = false;
                                                                 }
+                                                                setTimeout( function()
+                                                                {
+                                                                        editor.fire( 'dataReady' );
+                                                                }, 0 );
 
                                                                 /*
                                                                  * IE BUG: IE might have rendered the iframe with invisible contents.

_source/plugins/sourcearea/plugin.js

@@ -1 @@
-?/*
+/*
 Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
@@ -123 +123 @@
                                                 loadData : function( data )
                                                 {
                                                         textarea.setValue( data );
+                                                        editor.fire( 'dataReady' );
                                                 },
 
                                                 getData : function()

_source/plugins/newpage/plugin.js

@@ -19 +19 @@
                                 exec : function( editor )
                                 {
                                         var command = this;
-                                        function afterCommand()
+                                        editor.setData( editor.config.newpage_html, function()
                                         {
-                                                // Defer to happen after 'selectionChange'.
-                                                setTimeout( function()
-                                                {
-                                                        editor.fire( 'afterCommandExec',
-                                                        {
-                                                                name: command.name,
-                                                                command: command
-                                                        } );
-                                                }, 500 );
-                                        }
-                                        if ( editor.mode == 'wysiwyg')
-                                                editor.on( 'contentDom', function( evt ){
-
-                                                        evt.removeListener();
-                                afterCommand();
-                                                } );
-
-                                        editor.setData( editor.config.newpage_html );
+                                                editor.fire( 'afterCommandExec',
+                                                {
+                                                        name: command.name,
+                                                        command: command
+                                                } );
+                                        } );
                                         editor.focus();
-
-                                        if( editor.mode == 'source' )
-                                                afterCommand();
-
                                 },
                                 async : true
                         });

_source/core/editor.js

@@ -1 @@
-?/*
+/*
 Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
@@ -567 +567 @@
                 /**
                  * Sets the editor data. The data must be provided in raw format.
                  * @param {String} data HTML code to replace the curent content in the editor.
+                 * @param {Function} callback Function to be called after the setData is completed. 
                  * @example
                  * CKEDITOR.instances.editor1.<b>setData( '&lt;p&gt;This is the editor data.&lt;/p&gt;' )</b>;
+                 * CKEDITOR.instances.editor1.setData( '&lt;p&gt;Some other editor data.&lt;/p&gt;', function()
+                 * {
+                 *              CKEDITOR.instances.editor1.checkDirty();        // true
+                 * } );
                  */
-                setData : function( data )
+                setData : function( data , callback )
                 {
+                        this.on( 'dataReady', function( evt )
+                        {
+                                evt.removeListener();
+                                callback();
+                        } );
+
                         // Fire "setData" so data manipulation may happen.
                         var eventData = { dataValue : data };
                         this.fire( 'setData', eventData );