Ticket #3659: 3659.patch

_source/plugins/newpage/plugin.js

@@ -18 +18 @@
 
                                 exec : function( editor )
                                 {
+                                        var command = this;
+                                        function afterCommand()
+                                        {
+                                                // 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.focus();
-                                }
+
+                                        if( editor.mode == 'source' )
+                                                afterCommand();
+
+                                },
+                                async : true
                         });
 
                 editor.ui.addButton( 'NewPage',

_source/core/editor.js

@@ -477 +477 @@
                                 {
                                         eventData.returnValue = command.exec( eventData.commandData );
 
-                                        if ( this.fire( 'afterCommandExec', eventData ) !== true )
+                                        // Fire the 'afterCommandExec' immedidately only if command is synchronous.
+                                        if ( !command.async && this.fire( 'afterCommandExec', eventData ) !== true )
                                                 return eventData.returnValue;
                                 }
                         }

_source/core/commanddefinition.js

@@ -52 +52 @@
  *     canUndo : false    // No support for undo/redo
  * });
  */
+
+/**
+ * Whether the command is asynchronous, which means the 'afterCommandExec' event
+ * will be fired by the command itself manually, and the 'exec' function return value
+ * of this command is meaningless.
+ * @name  CKEDITOR.commandDefinition.async
+ * @type {Boolean} If defined as 'true', the command is asynchronous.
+ * @example
+ * editorInstance.addCommand( 'alertName',
+ * {
+ *     exec : function( editor )
+ *     {
+ *         alert( editor.name );
+ *     },
+ *     async : true    // The command need some time to complete after exec function returns.
+ * });
+ */