Ticket #8299: 8229_3.patch

_source/plugins/wysiwygarea/plugin.js

@@ -1104 +1104 @@
                                         // Auto fixing on some document structure weakness to enhance usabilities. (#3190 and #3189)
                                         editor.on( 'selectionChange', function( evt )
                                         {
-                                                CKEDITOR.tools.setTimeout( function() {
-                                                        var sel = editor.getSelection();
-                                                        // Do it only when selection is not locked. (#8222)
-                                                        if ( sel && !sel.isLocked )
-                                                        {
-                                                                var isDirty = editor.checkDirty();
-                                                                onSelectionChangeFixBody.call( this, evt );
-                                                                editor.fire( 'updateSnapshot' );
-                                                                !isDirty && editor.resetDirty();
-                                                        }
-                                                }, 0, this );
+                                                var sel = editor.getSelection();
+                                                // Do it only when selection is not locked. (#8222)
+                                                if ( sel && !sel.isLocked )
+                                                {
+                                                        var isDirty = editor.checkDirty();
+                                                        editor.fire( 'saveSnapshot', { contentOnly : 1 } );
+                                                        onSelectionChangeFixBody.call( this, evt );
+                                                        editor.fire( 'updateSnapshot' );
+                                                        !isDirty && editor.resetDirty();
+                                                }
 
                                         }, null, null, 1 );
                                 });

_source/plugins/undo/plugin.js

@@ -64 +64 @@
                         editor.on( 'afterCommandExec', recordCommand );
 
                         // Save snapshots before doing custom changes.
-                        editor.on( 'saveSnapshot', function()
+                        editor.on( 'saveSnapshot', function( evt )
                                 {
-                                        undoManager.save();
+                                        undoManager.save( evt.data && evt.data.contentOnly );
                                 });
 
                         // Registering keydown on every document recreation.(#3844)