Ticket #3573: 3573.patch

_source/plugins/wysiwygarea/plugin.js

@@ -52 +52 @@
                 if ( this.mode == 'wysiwyg' )
                 {
                         this.focus();
+                        this.fire( 'saveSnapshot' );
 
                         var element = evt.data,
                                 elementName = element.getName(),
@@ -104 +105 @@
 
                         if ( selIsLocked )
                                 this.getSelection().lock();
+
+                        // Save snaps after the whole execution completed.
+                        // This's a workaround for make DOM modification's happened after
+                        // 'insertElement' to be included either, e.g. Form-based dialogs' 'commitContents'
+                        // call.
+                        CKEDITOR.tools.setTimeout( function(){
+                                this.fire( 'saveSnapshot' );
+                        }, 0, this );
                 }
         }
         

_source/plugins/dialog/plugin.js

@@ -2441 +2441 @@
                 exec : function( editor )
                 {
                         editor.openDialog( this.dialogName );
-                }
+                },
+                // Dialog commands just open a dialog ui, thus require no undo logic,
+                // undo support should dedicate to specific dialog implementation.
+                canUndo: false
         };
 
         (function()