Ticket #1630: 1630_ref.patch

_source/plugins/undo/plugin.js

@@ -16 +16 @@
 
                 init : function( editor )
                 {
-                        var undoManager = new UndoManager( editor );
+                        // Make undoManager public inside editor instance.
+                        var undoManager = editor.undoManager = new UndoManager( editor );
 
                         var undoCommand = editor.addCommand( 'undo',
                                 {

_source/plugins/sourcearea/plugin.js

@@ -89 +89 @@
                                                         // The editor data "may be dirty" after this point.
                                                         editor.mayBeDirty = true;
 
+                                                        // Inherit undo snapshots by textarea.
+                                                        if ( editor.undoManager && editor.undoManager.hasUndo )
+                                                        {
+                                                                var fixForBody = ( editor.config.enterMode != CKEDITOR.ENTER_BR )
+                                                                        ? editor.config.enterMode == CKEDITOR.ENTER_DIV ? 'div' : 'p' : false;
+
+                                                                // Skip last snapshot.
+                                                                for ( var i = 0 ; i < editor.undoManager.index ; i++ )
+                                                                {
+                                                                        var undoData = editor.undoManager.snapshots[ i ].contents;
+
+                                                                        if ( editor.dataProcessor )
+                                                                                undoData = editor.dataProcessor.toDataFormat( undoData, fixForBody );
+                                                                        
+                                                                        this.loadData( undoData );
+                                                                }
+                                                        }
+
                                                         // Set the <textarea> value.
                                                         this.loadData( data );