Changeset 400

Timestamp:

2007-06-29 14:24:58 (17 months ago)

Author:

martinkou

Message:

Fixed #915 : All recognized bugs in the undo/redo system are fixed and all features are working in both Internet Explorer and Gecko.

Location:

FCKeditor/trunk

Files:

• editor/fckeditor.html (modified) (1 diff)
• editor/_source/internals/fck_gecko.js (modified) (1 diff)
• editor/_source/internals/fck_ie.js (modified) (2 diffs)
• editor/_source/internals/fck.js (modified) (1 diff)
• editor/_source/internals/fckundo_gecko.js (deleted)
• editor/_source/internals/fckundo_ie.js (deleted)
• editor/_source/internals/fckundo.js (added)
• _whatsnew.html (modified) (1 diff)

FCKeditor/trunk/editor/fckeditor.html

@@ -82 +82 @@
 LoadScript( '_source/internals/fckxhtml_' + sSuffix + '.js' ) ;
 LoadScript( '_source/internals/fckcodeformatter.js' ) ;
-LoadScript( '_source/internals/fckundo_' + sSuffix + '.js' ) ;
+LoadScript( '_source/internals/fckundo.js' ) ;
 LoadScript( '_source/classes/fckeditingarea.js' ) ;
 LoadScript( '_source/classes/fckkeystrokehandler.js' ) ;

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

@@ -25 +25 @@
 
 FCK.Description = "FCKeditor for Gecko Browsers" ;
-
-FCK._KeyDownUndo = function()
-{
-        if ( !FCKUndo.Typing )
-        {
-                FCKUndo.SaveUndoStep() ;
-                FCKUndo.Typing = true ;
-                FCK.Events.FireEvent( "OnSelectionChange" ) ;
-        }
-
-        FCKUndo.TypesCount++ ;
-        FCKUndo.Changed = 1;
-
-        if ( FCKUndo.TypesCount > FCKUndo.MaxTypes )
-        {
-                FCKUndo.TypesCount = 0 ;
-                FCKUndo.SaveUndoStep() ;
-        }
-}
-
-FCK._IsFunctionKey = function(keyCode)
-{
-        // keys that are captured but do not change editor contents
-        if (keyCode >= 16 && keyCode <= 20)
-                // shift, ctrl, alt, pause, capslock
-                return true;
-        if (keyCode == 27 || (keyCode >= 33 && keyCode <= 40))
-                // esc, page up, page down, end, home, left, up, right, down
-                return true;
-        if (keyCode == 45)
-                // insert, no effect on FCKeditor, yet
-                return true;
-        return false;
-}
-
-FCK._KeyDownListener = function( evt )
-{
-        if ( FCK.EditorWindow )
-        {
-                if ( !FCK._IsFunctionKey(evt.keyCode) // do not capture function key presses, like arrow keys or shift/alt/ctrl
-                        && !(evt.ctrlKey || evt.metaKey) // do not capture Ctrl hotkeys, as they have their snapshot capture logic
-                        && !(evt.keyCode == 46) ) // do not capture Del, it has its own capture logic in fckenterkey.js
-                        FCK._KeyDownUndo();
-        }
-        return true;
-}
 
 FCK.InitializeBehaviors = function()

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

@@ -77 +77 @@
 }
 
-function Doc_OnKeyDown()
-{
-        if ( FCK.EditorWindow )
-        {
-                var e = FCK.EditorWindow.event ;
-
-                if ( !( e.keyCode >=16 && e.keyCode <= 18 ) )
-                        Doc_OnKeyDownUndo() ;
-        }
-        return true ;
-}
-
-function Doc_OnKeyDownUndo()
-{
-        if ( !FCKUndo.Typing )
-        {
-                FCKUndo.SaveUndoStep() ;
-                FCKUndo.Typing = true ;
-                FCK.Events.FireEvent( "OnSelectionChange" ) ;
-        }
-
-        FCKUndo.TypesCount++ ;
-
-        if ( FCKUndo.TypesCount > FCKUndo.MaxTypes )
-        {
-                FCKUndo.TypesCount = 0 ;
-                FCKUndo.SaveUndoStep() ;
-        }
-}
-
 function Doc_OnDblClick()
 {
@@ -137 +107 @@
                         window.FCKTabHTML += "&nbsp;" ;
         }
-        this.EditorDocument.attachEvent("onkeydown", Doc_OnKeyDown ) ;
+        this.EditorDocument.attachEvent("onkeydown", FCK._KeyDownListener ) ;
 
         this.EditorDocument.attachEvent("ondblclick", Doc_OnDblClick ) ;

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

@@ -625 +625 @@
         _InsertBlockElement : function( blockElement )
         {
+        },
+
+        _IsFunctionKey : function(keyCode)
+        {
+                // keys that are captured but do not change editor contents
+                if (keyCode >= 16 && keyCode <= 20)
+                        // shift, ctrl, alt, pause, capslock
+                        return true;
+                if (keyCode == 27 || (keyCode >= 33 && keyCode <= 40))
+                        // esc, page up, page down, end, home, left, up, right, down
+                        return true;
+                if (keyCode == 45)
+                        // insert, no effect on FCKeditor, yet
+                        return true;
+                return false;
+        },
+
+        _KeyDownListener : function( evt )
+        {
+                if (! evt)
+                        evt = FCK.EditorWindow.event;
+                if ( FCK.EditorWindow )
+                {
+                        if ( !FCK._IsFunctionKey(evt.keyCode) // do not capture function key presses, like arrow keys or shift/alt/ctrl
+                                        && !(evt.ctrlKey || evt.metaKey) // do not capture Ctrl hotkeys, as they have their snapshot capture logic
+                                        && !(evt.keyCode == 46) ) // do not capture Del, it has its own capture logic in fckenterkey.js
+                                FCK._KeyDownUndo();
+                }
+                return true;
+        },
+
+        _KeyDownUndo : function()
+        {
+                if ( !FCKUndo.Typing )
+                {
+                        FCKUndo.SaveUndoStep() ;
+                        FCKUndo.Typing = true ;
+                        FCK.Events.FireEvent( "OnSelectionChange" ) ;
+                }
+
+                FCKUndo.TypesCount++ ;
+                FCKUndo.Changed = 1;
+
+                if ( FCKUndo.TypesCount > FCKUndo.MaxTypes )
+                {
+                        FCKUndo.TypesCount = 0 ;
+                        FCKUndo.SaveUndoStep() ;
+                }
         }
 } ;

FCKeditor/trunk/_whatsnew.html

@@ -35 +35 @@
                 New Features and Improvements:</p>
         <ul>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/915">#915</a>] The undo/redo system has been
+                        revamped to work the same across Internet Explorer and Gecko-based browsers (e.g. Firefox). A number
+                        of critical bugs in the undo/redo system are also fixed.</li>
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/194">#194</a>] The editor
                         now uses the <strong>Data Processor</strong> technology, which makes it possible