Ticket #7896: 7896.patch

_source/plugins/wysiwygarea/plugin.js

@@ -288 +288 @@
                         this.getSelection().lock();
         }
 
-        // DOM modification here should not bother dirty flag.(#4385)
-        function restoreDirty( editor )
-        {
-                if ( !editor.checkDirty() )
-                        setTimeout( function(){ editor.resetDirty(); }, 0 );
-        }
-
         var isNotWhitespace = CKEDITOR.dom.walker.whitespaces( true ),
                 isNotBookmark = CKEDITOR.dom.walker.bookmark( false, true );
 
@@ -309 +302 @@
                            && CKEDITOR.tools.trim( node.getText() ).match( /^(?: |\xa0)$/ );
         }
 
-        function restoreSelection( selection )
-        {
-                if ( selection.isLocked )
-                {
-                        selection.unlock();
-                        setTimeout( function() { selection.lock(); }, 0 );
-                }
-        }
-
         function isBlankParagraph( block )
         {
                 return block.getOuterHtml().match( emptyParagraphRegexp );
@@ -366 +350 @@
                 }
         }
 
+        /*
+         *      Revert various editor status which should get affected by the changes brought by the executed function: (#4385,#5221)
+         *      1. dirty flag;
+         *      2. selection lock;
+         *      3. undo stack;
+         */
+        function keepEditorStatus( editor, func )
+        {
+                return function()
+                {
+                        var wasClean = !editor.checkDirty();
+                        var sel = editor.getSelection();
+                        if ( !sel || sel.isLocked )
+                                return;
+                        editor.fire( 'updateSnapshot' );
+
+                        func.apply( this, arguments );
+
+                        wasClean && editor.resetDirty();
+                };
+        }
+
         /**
          *  Auto-fixing block-less content by wrapping paragraph (#3190), prevent
          *  non-exitable-block by padding extra br.(#3189)
@@ -398 +404 @@
                                         && !pathBlock.is( 'pre' )
                                         && !pathBlock.getBogus() )
                         {
-                                editor.fire( 'updateSnapshot' );
-                                restoreDirty( editor );
                                 pathBlock.appendBogus();
                         }
                 }
@@ -412 +416 @@
                                 && 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 +464 @@
                 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 +1121 @@
                                         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', keepEditorStatus( editor, onSelectionChangeFixBody ), null, null, 1 );
                                 });
 
                         var titleBackup;