Changeset 7455

Timestamp:

04/06/12 10:00:02 (15 months ago)

Author:

garry.yao

Message:

#8459: Fixing a wrong undo step created after enter key.

Location:

CKEditor/trunk

Files:

• CHANGES.html (modified) (1 diff)
• _source/plugins/undo/plugin.js (modified) (2 diffs)

CKEditor/trunk/CHANGES.html

@@ -100 +100 @@
                 <li><a href="http://dev.ckeditor.com/ticket/8528">#8528</a> : Redundant <code>imagePreviewBoxId</code> in the Image Properties dialog window is now removed.</li>
                 <li><a href="http://dev.ckeditor.com/ticket/8864">#8864</a> : [IE]Fix ARIA presentation of toolbar rich combo in JAWS.</li>
+                <li><a href="http://dev.ckeditor.com/ticket/8459">#8459</a> : Fix wrong undo step on enter key.</li>
                 <li>Updated the following language files as submitted to the <a href="https://www.transifex.net/projects/p/ckeditor/">CKEditor UI Translation Center</a>: Arabic, Bulgarian, Chinese, Croatian, Czech, Danish, Dutch, Esperanto, Estonian, Faroese, French, German, Greek, Gujarati, Hindi, Italian, Macedonian, Norwegian (Bokmål and Nynorsk), Polish, Portuguese, Turkish, Uighur, Ukrainian, Vietnamese, Welsh.</li>
         </ul>

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

@@ -261 +261 @@
                         if ( startedTyping || modifierSnapshot )
                         {
-                                var beforeTypeImage = new Image( this.editor );
+                                var beforeTypeImage = new Image( this.editor ),
+                                        beforeTypeCount = this.snapshots.length;
 
                                 // Use setTimeout, so we give the necessary time to the
@@ -273 +274 @@
                                                         currentSnapshot = currentSnapshot.replace( /\s+data-cke-expando=".*?"/g, '' );
 
-                                                if ( beforeTypeImage.contents != currentSnapshot )
+                                                // If changes have taken place, while not been captured yet (#8459),
+                                                // compensate the snapshot.
+                                                if ( beforeTypeImage.contents != currentSnapshot &&
+                                                         beforeTypeCount == this.snapshots.length )
                                                 {
                                                         // It's safe to now indicate typing state.