Ticket #5530: 5530_3.patch

_source/plugins/pagebreak/plugin.js

@@ -84 +84 @@
 
                 var ranges = editor.getSelection().getRanges();
 
+                editor.fire( 'saveSnapshot' );
+
                 for ( var range, i = 0 ; i < ranges.length ; i++ )
                 {
                         range = ranges[ i ];
@@ -99 +101 @@
                                 range.select();
                         }
                 }
+
+                editor.fire( 'saveSnapshot' );
         }
 };

_source/plugins/wysiwygarea/plugin.js

@@ -191 +191 @@
                          && blockLimit.getName() == 'body'
                          && !path.block )
                 {
+                        editor.fire( 'updateSnapshot' );
                         restoreDirty( editor );
                         CKEDITOR.env.ie && restoreSelection( selection );
 
@@ -245 +246 @@
 
                 if ( walker.previous() )
                 {
+                        editor.fire( 'updateSnapshot' );
                         restoreDirty( editor );
                         CKEDITOR.env.ie && restoreSelection( selection );
 

_source/plugins/undo/plugin.js

@@ -114 +114 @@
                                 // Create the first image.
                                 editor.fire( 'saveSnapshot' );
                         };
+
+                        /**
+                         * Update the undo stacks with any subsequent DOM changes after this call.
+                         * @name CKEDITOR.editor#updateUndo
+                         * @example
+                         * function()
+                         * {
+                         * editor.fire( 'updateSnapshot' );
+                         * ...
+                         *  // Ask to include subsequent (in this call stack) DOM changes to be
+                         * // considered as part of the latest snapshot.
+                         *      editor.fire( 'updateSnapshot' );
+                         *      editor.document.body.append(...);
+                         * ...
+                         * }
+                         */
+                        editor.on( 'updateSnapshot', function()
+                        {
+                                var editorImage = new Image( editor );
+                                if ( undoManager.currentImage && editorImage.equals( undoManager.currentImage ) )
+                                        setTimeout( function () { undoManager.update( editorImage ); }, 0 );
+                        });
                 }
         });
 
@@ -397 +419 @@
                         // Update current image with the actual editor
                         // content, since actualy content may differ from
                         // the original snapshot due to dom change. (#4622)
-                        this.snapshots.splice( this.index, 1, ( this.currentImage =  new Image( this.editor ) ) );
-
+                        this.update();
                         this.fireChange();
                 },
 
@@ -497 +518 @@
                         }
 
                         return false;
+                },
+
+                /**
+                 * Update the last snapshot of the undo stack with the current editor content.
+                 * @param {Image} newImg
+                 */
+                update : function( newImg )
+                {
+                        this.snapshots.splice( this.index, 1, ( this.currentImage = newImg ) );
                 }
         };
 })();