Ticket #8222: 8222_3.patch

_source/plugins/wysiwygarea/plugin.js

@@ -398 +398 @@
                                         && !pathBlock.is( 'pre' )
                                         && !pathBlock.getBogus() )
                         {
-                                editor.fire( 'updateSnapshot' );
-                                restoreDirty( editor );
                                 pathBlock.appendBogus();
                         }
                 }
@@ -412 +410 @@
                                 && blockLimit.getName() == 'body'
                                 && !path.block )
                 {
-                        editor.fire( 'updateSnapshot' );
-                        restoreDirty( editor );
-                        CKEDITOR.env.ie && restoreSelection( selection );
-
                         var fixedBlock = range.fixBlock( true,
                                         editor.config.enterMode == CKEDITOR.ENTER_DIV ? 'div' : 'p'  );
 
@@ -464 +458 @@
                 var testPath = new CKEDITOR.dom.elementPath( testRange.startContainer );
                 if ( !testPath.blockLimit.is( 'body') )
                 {
-                        editor.fire( 'updateSnapshot' );
-                        restoreDirty( editor );
-                        CKEDITOR.env.ie && restoreSelection( selection );
-
                         var paddingBlock;
                         if ( enterMode != CKEDITOR.ENTER_BR )
                                 paddingBlock = body.append( editor.document.createElement( enterMode == CKEDITOR.ENTER_P ? 'p' : 'div' ) );
@@ -1125 +1115 @@
                                         editor.on( 'insertElement', onInsert( doInsertElement ), null, null, 20 );
                                         editor.on( 'insertText', onInsert( doInsertText ), null, null, 20 );
                                         // Auto fixing on some document structure weakness to enhance usabilities. (#3190 and #3189)
-                                        editor.on( 'selectionChange', onSelectionChangeFixBody, null, null, 1 );
+                                        editor.on( 'selectionChange', function()
+                                        {
+                                                var sel = editor.getSelection();
+                                                // Do it only when selection is not locked. (#8222)
+                                                if ( sel && !sel.isLocked )
+                                                {
+                                                        var isDirty = editor.checkDirty();
+                                                        onSelectionChangeFixBody.apply( this, arguments );
+                                                        editor.fire( 'updateSnapshot' );
+                                                        !isDirty && editor.resetDirty();
+                                                }
+                                        }, null, null, 1 );
                                 });
 
                         var titleBackup;

_source/plugins/undo/plugin.js

@@ -116 +116 @@
                         };
 
                         /**
-                         * Update the undo stacks with any subsequent DOM changes after this call.
+                         * Amend the top of undo stack (last undo image) with the current DOM changes.
                          * @name CKEDITOR.editor#updateUndo
                          * @example
                          * function()
                          * {
-                         * editor.fire( 'updateSnapshot' );
+                         *  editor.fire( 'saveSnapshot' );
+                         *      editor.document.body.append(...);
+                         *  // Make new changes following the last undo snapshot part of it.
+                         *      editor.fire( 'updateSnapshot' );
                          * ...
-                         *  // Ask to include subsequent (in this call stack) DOM changes to be
-                         * // considered as part of the first snapshot.
-                         *      editor.fire( 'updateSnapshot' );
-                         *      editor.document.body.append(...);
-                         * ...
                          * }
                          */
                         editor.on( 'updateSnapshot', function()
                         {
-                                if ( undoManager.currentImage && new Image( editor ).equals( undoManager.currentImage ) )
-                                        setTimeout( function() { undoManager.update(); }, 0 );
+                                if ( undoManager.currentImage )
+                                        undoManager.update();
                         });
                 }
         });