Changeset 5163

Timestamp:

02/20/10 23:52:15 (3 years ago)

Author:

fredck

Message:

#5191, #5208: Reverting [5015] as it's breaking the undo behavior.

Location:

CKEditor/trunk

Files:

• CHANGES.html (modified) (1 diff)
• _source/core/editor.js (modified) (2 diffs)

CKEditor/trunk/CHANGES.html

@@ -80 +80 @@
                 <li><a href="http://dev.fckeditor.net/ticket/4951">#4951</a> : Replacing patterns into empty string throws errors.</li>
                 <li><a href="http://dev.fckeditor.net/ticket/4963">#4963</a> : Link dialog doesn't open properly for e-mail type links.</li>
-                <li><a href="http://dev.fckeditor.net/ticket/4999">#4999</a> : Adding undo snapshot for editor::setData.</li>
                 <li><a href="http://dev.fckeditor.net/ticket/5043">#5043</a> : Removed the possibility of having an unwanted script tag being outputted with the editor contents.</li>
                 <li><a href="http://dev.fckeditor.net/ticket/3678">#3678</a> : There were issues when editing links inside floating divs with IE.</li>

CKEditor/trunk/_source/core/editor.js

@@ -584 +584 @@
                  * @param {Function} callback Function to be called after the setData
                  *              is completed.
-                 * @param {Boolean} noUndo Indicates that the function call must not
-                 *              create and undo snapshot.
                  * @example
                  * CKEDITOR.instances.editor1.<b>setData</b>( '&lt;p&gt;This is the editor data.&lt;/p&gt;' );
@@ -594 +592 @@
                  *     });
                  */
-                setData : function( data , callback, noUndo )
-                {
-                        noUndo !== false && this.fire( 'saveSnapshot' );
-
-                        this.on( 'dataReady', function( evt )
+                setData : function( data , callback )
+                {
+                        if( callback )
+                        {
+                                this.on( 'dataReady', function( evt )
                                 {
                                         evt.removeListener();
-                                        callback && callback.call( evt.editor );
-                                        noUndo !== false && this.fire( 'saveSnapshot' );
-                                });
+                                        callback.call( evt.editor );
+                                } );
+                        }
 
                         // Fire "setData" so data manipulation may happen.