Ticket #4445: 4445.patch

_source/plugins/wysiwygarea/plugin.js

@@ -214 +214 @@
                                         var mainElement,
                                                 fieldset,
                                                 iframe,
-                                                isLoadingData,
                                                 isPendingFocus,
                                                 frameLoaded,
                                                 fireMode;
@@ -448 +447 @@
                                                                         fireMode = false;
                                                                 }
 
-                                                                isLoadingData = false;
+                                                                delete editor._.isLoadingData;
 
                                                                 if ( isPendingFocus )
                                                                 {
@@ -503 +502 @@
 
                                                         loadData : function( data )
                                                         {
-                                                                isLoadingData = true;
+                                                                editor._.isLoadingData = true;
 
                                                                 // Get the HTML version of the data.
                                                                 if ( editor.dataProcessor )
@@ -573 +572 @@
 
                                                         focus : function()
                                                         {
-                                                                if ( isLoadingData )
+                                                                if ( editor._.isLoadingData )
                                                                         isPendingFocus = true;
                                                                 else if ( editor.window )
                                                                 {

_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

@@ -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 )
                 {
                         // Fire "setData" so data manipulation may happen.
                         var eventData = { dataValue : data };
@@ -579 +584 @@
                         this._.data = eventData.dataValue;
 
                         this.fire( 'afterSetData', eventData );
+
+                        if( callback )
+                        {
+                                if( this._.isLoadingData )
+                                        this.on( 'contentDom', function( evt )
+                                        {
+                                                // A short delay to make sure cursor
+                                                // has started blinking.
+                                                setTimeout( callback, 300 );
+                                        } );
+                                else
+                                        callback();
+                        }
                 },
 
                 /**