Changeset 629

Timestamp:

2007-08-07 06:58:14 (3 years ago)

Author:

martinkou

Message:

Fixed #1026 : Fixed the issue where the undo system is unable to restore cursor position when the cursor is placed inside or after empty block elements.

Files:

• FCKeditor/trunk/editor/_source/internals/fckundo.js (modified) (4 diffs)

FCKeditor/trunk/editor/_source/internals/fckundo.js

@@ -18 +18 @@
  *
  * == END LICENSE ==
- *
- * Gecko specific implementation for the Undo/Redo system.
  */
 
@@ -35 +33 @@
         var range = new FCKDomRange( FCK.EditorWindow ) ;
         range.MoveToSelection() ;
+        if ( FCKBrowserInfo.IsIE )
+        {
+                var bookmark = range.CreateBookmark() ;
+                var dirtyHtml = FCK.EditorDocument.body.innerHTML ;
+                range.MoveToBookmark( bookmark ) ;
+                return [ bookmark, dirtyHtml ] ;
+        }
         return range.CreateBookmark2() ;
 }
@@ -42 +47 @@
         if ( ! bookmark )
                 return ;
+
         var range = new FCKDomRange( FCK.EditorWindow ) ;
         if ( bookmark instanceof Object )
         {
-                range.MoveToBookmark2( bookmark ) ;
+                if ( FCKBrowserInfo.IsIE )
+                        range.MoveToBookmark( bookmark[0] ) ;
+                else
+                        range.MoveToBookmark2( bookmark ) ;
                 try
                 {
@@ -148 +157 @@
         // Update the editor contents with that step data.
         if ( FCKBrowserInfo.IsIE )
-                FCK.SetInnerHtml( oData[0] ) ;
+                FCK.SetInnerHtml( oData[1][1] ) ;
         else
                 FCK.EditorDocument.body.innerHTML = oData[0] ;