Changeset 4279

Timestamp:

09/23/09 12:48:50 (4 years ago)

Author:

garry.yao

Message:

Post fixing #4385: Editor's auto adjusting on DOM structure were confusing the dirty checking mechanism.

File:

• CKEditor/trunk/_source/plugins/wysiwygarea/plugin.js (modified) (5 diffs)

CKEditor/trunk/_source/plugins/wysiwygarea/plugin.js

@@ -123 +123 @@
         }
 
+        // DOM modification here should not bother dirty flag.(#4385)
+        function restoreDirty( editor )
+        {
+                if( !editor.checkDirty() )
+                        setTimeout( function(){ editor.resetDirty() } );
+        }
+
         /**
          *  Auto-fixing block-less content by wrapping paragraph (#3190), prevent
@@ -135 +142 @@
                         range = selection.getRanges()[0],
                         body = editor.document.getBody(),
-                        enterMode = editor.config.enterMode,
-                        isDirtyBeforeFix = editor.checkDirty();
+                        enterMode = editor.config.enterMode;
 
                 // When enterMode set to block, we'll establing new paragraph only if we're
@@ -145 +151 @@
                          && !path.block )
                 {
+                        restoreDirty( editor );
                         var bms = selection.createBookmarks(),
                                 fixedBlock = range.fixBlock( true,
@@ -195 +202 @@
                 if ( lastNode && lastNode.getName && ( lastNode.getName() in nonExitableElementNames ) )
                 {
+                        restoreDirty( editor );
                         var paddingBlock = editor.document.createElement(
                                         ( CKEDITOR.env.ie && enterMode != CKEDITOR.ENTER_BR ) ?
@@ -200 +208 @@
                         body.append( paddingBlock );
                 }
-
-                // DOM modification here should not bother dirty flag.(#4385)
-                if( !isDirtyBeforeFix )
-                        editor.resetDirty();
         }