Changeset 7455


Ignore:
Timestamp:
04/06/12 10:00:02 (2 years ago)
Author:
garry.yao
Message:

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

Location:
CKEditor/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • CKEditor/trunk/CHANGES.html

    r7453 r7455  
    100100                <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> 
    101101                <li><a href="http://dev.ckeditor.com/ticket/8864">#8864</a> : [IE]Fix ARIA presentation of toolbar rich combo in JAWS.</li> 
     102                <li><a href="http://dev.ckeditor.com/ticket/8459">#8459</a> : Fix wrong undo step on enter key.</li> 
    102103                <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> 
    103104        </ul> 
  • CKEditor/trunk/_source/plugins/undo/plugin.js

    r7414 r7455  
    261261                        if ( startedTyping || modifierSnapshot ) 
    262262                        { 
    263                                 var beforeTypeImage = new Image( this.editor ); 
     263                                var beforeTypeImage = new Image( this.editor ), 
     264                                        beforeTypeCount = this.snapshots.length; 
    264265 
    265266                                // Use setTimeout, so we give the necessary time to the 
     
    273274                                                        currentSnapshot = currentSnapshot.replace( /\s+data-cke-expando=".*?"/g, '' ); 
    274275 
    275                                                 if ( beforeTypeImage.contents != currentSnapshot ) 
     276                                                // If changes have taken place, while not been captured yet (#8459), 
     277                                                // compensate the snapshot. 
     278                                                if ( beforeTypeImage.contents != currentSnapshot && 
     279                                                         beforeTypeCount == this.snapshots.length ) 
    276280                                                { 
    277281                                                        // It's safe to now indicate typing state. 
Note: See TracChangeset for help on using the changeset viewer.
© 2003 – 2012 CKSource – Frederico Knabben. All rights reserved. | Terms of use | Privacy policy