Changeset 403

Timestamp:

2007-07-02 11:12:21 (19 months ago)

Author:

martinkou

Message:

Changed the new undo system code to conform to FCKeditor's coding style guidelines.

Location:

FCKeditor/trunk/editor

Files:

• dialog/fck_smiley.html (modified) (1 diff)
• dialog/fck_specialchar.html (modified) (1 diff)
• _source/classes/fckdomrange.js (modified) (3 diffs)
• _source/classes/fckenterkey.js (modified) (1 diff)
• _source/commandclasses/fck_othercommands.js (modified) (4 diffs)
• _source/internals/fck_gecko.js (modified) (1 diff)
• _source/internals/fck.js (modified) (5 diffs)
• _source/internals/fckundo.js (modified) (4 diffs)

FCKeditor/trunk/editor/dialog/fck_smiley.html

@@ -46 +46 @@
 function InsertSmiley( url )
 {
-        oEditor.FCKUndo.SaveUndoStep();
+        oEditor.FCKUndo.SaveUndoStep() ;
         var oImg = oEditor.FCK.InsertElement( 'img' ) ;
         oImg.src = url ;

FCKeditor/trunk/editor/dialog/fck_specialchar.html

@@ -42 +42 @@
 function insertChar(charValue)
 {
-        oEditor.FCKUndo.SaveUndoStep();
+        oEditor.FCKUndo.SaveUndoStep() ;
         oEditor.FCK.InsertHtml( charValue || "" ) ;
         window.parent.Cancel() ;

FCKeditor/trunk/editor/_source/classes/fckdomrange.js

@@ -283 +283 @@
                 var bookmark = 
                 {
-                        "Start": [this._Range.startOffset],
-                        "End": [this._Range.endOffset]
-                };
+                        "Start" : [ this._Range.startOffset ],
+                        "End" : [ this._Range.endOffset ]
+                } ;
                 // Then, we record down the precise position of the container nodes
                 // by walking up the DOM tree and counting their childNode index
-                var curNode = this._Range.startContainer;
-                while(curNode && curNode != this.Window.document.documentElement)
-                {
-                        var curParent = curNode.parentNode;
-                        for(var i=0;i<curParent.childNodes.length;i++)
+                var curNode = this._Range.startContainer ;
+                while ( curNode && curNode != this.Window.document.documentElement )
+                {
+                        var curParent = curNode.parentNode ;
+                        for( var i = 0 ; i < curParent.childNodes.length ; i++ )
                         {
-                                if (curParent.childNodes.item(i) == curNode)
-                                {
-                                        bookmark.Start.unshift(i);
-                                        break;
+                                if ( curParent.childNodes.item( i ) == curNode )
+                                {
+                                        bookmark.Start.unshift( i ) ;
+                                        break ;
                                 }
                         }
@@ -303 +303 @@
                 }
                 curNode = this._Range.endContainer;
-                while(curNode && curNode != this.Window.document.documentElement)
+                while ( curNode && curNode != this.Window.document.documentElement )
                 {
                         var curParent = curNode.parentNode;
-                        for(var i=0;i<curParent.childNodes.length;i++)
+                        for ( var i = 0 ; i < curParent.childNodes.length ; i++ )
                         {
-                                if (curParent.childNodes.item(i) == curNode)
-                                {
-                                        bookmark.End.unshift(i);
+                                if ( curParent.childNodes.item( i ) == curNode )
+                                {
+                                        bookmark.End.unshift( i );
                                         break;
                                 }
@@ -322 +322 @@
         {
                 // Reverse the childNode counting algorithm in CreateBookmark2()
-                var curStart = this.Window.document.documentElement;
-                var curEnd = this.Window.document.documentElement;
-                for(var i=0;i<bookmark.Start.length -1;i++)
-                        curStart = curStart.childNodes.item(bookmark.Start[i]);
-                for(var i=0;i<bookmark.End.length -1;i++)
-                        curEnd = curEnd.childNodes.item(bookmark.End[i]);
+                var curStart = this.Window.document.documentElement ;
+                var curEnd = this.Window.document.documentElement ;
+                for ( var i = 0 ; i < bookmark.Start.length - 1 ; i++ )
+                        curStart = curStart.childNodes.item( bookmark.Start[ i ] ) ;
+                for ( var i = 0 ; i < bookmark.End.length - 1 ; i++ )
+                        curEnd = curEnd.childNodes.item( bookmark.End[ i ] ) ;
 
                 // Generate the W3C Range object and update relevant data
-                this.Release(true);
-                this._Range = new FCKW3CRange(this.Window.document);
-                this._Range.setStart(curStart, bookmark.Start[bookmark.Start.length -1]);
-                this._Range.setEnd(curEnd, bookmark.End[bookmark.End.length -1]);
-                this._UpdateElementInfo();
+                this.Release( true ) ;
+                this._Range = new FCKW3CRange( this.Window.document ) ;
+                this._Range.setStart( curStart, bookmark.Start[ bookmark.Start.length - 1 ] ) ;
+                this._Range.setEnd( curEnd, bookmark.End[ bookmark.End.length - 1 ] ) ;
+                this._UpdateElementInfo() ;
         },
 

FCKeditor/trunk/editor/_source/classes/fckenterkey.js

@@ -259 +259 @@
         // Save an undo snapshot before doing anything
         // This is to conform with the behavior seen in MS Word
-        FCKUndo.SaveUndoStep();
+        FCKUndo.SaveUndoStep() ;
 
         // The <Delete> has the same effect as the <Backspace>, so we have the same

FCKeditor/trunk/editor/_source/commandclasses/fck_othercommands.js

@@ -264 +264 @@
 {
         // Take an undo snapshot before changing the document
-        FCKUndo.SaveUndoStep();
+        FCKUndo.SaveUndoStep() ;
 
 //      var e = FCK.EditorDocument.createElement( 'CENTER' ) ;
@@ -293 +293 @@
 {
         // Take an undo snapshot before changing the document
-        FCKUndo.SaveUndoStep();
+        FCKUndo.SaveUndoStep() ;
 
         if ( FCKBrowserInfo.IsGecko )
@@ -346 +346 @@
                 else
                 {
-                        textarea.selectionStart = 0;
+                        textarea.selectionStart = 0 ;
                         textarea.selectionEnd = textarea.value.length ;
                 }
@@ -390 +390 @@
         Execute : function()
         {
-                FCKUndo.SaveUndoStep();
+                FCKUndo.SaveUndoStep() ;
                 FCK.InsertElement( 'hr' ) ;
         },

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

@@ -131 +131 @@
 {
         // Save a snapshot for undo before actually paste the text
-        FCKUndo.SaveUndoStep();
+        FCKUndo.SaveUndoStep() ;
 
         if ( FCKConfig.ForcePasteAsPlainText )

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

@@ -627 +627 @@
         },
 
-        _IsFunctionKey : function(keyCode)
+        _IsFunctionKey : function( keyCode )
         {
                 // keys that are captured but do not change editor contents
-                if (keyCode >= 16 && keyCode <= 20)
+                if ( keyCode >= 16 && keyCode <= 20 )
                         // shift, ctrl, alt, pause, capslock
-                        return true;
-                if (keyCode == 27 || (keyCode >= 33 && keyCode <= 40))
+                        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)
+                        return true ;
+                if ( keyCode == 45 )
                         // insert, no effect on FCKeditor, yet
-                        return true;
-                return false;
+                        return true ;
+                return false ;
         },
 
@@ -645 +645 @@
         {
                 if (! evt)
-                        evt = FCK.EditorWindow.event;
+                        evt = FCK.EditorWindow.event ;
                 if ( FCK.EditorWindow )
                 {
@@ -651 +651 @@
                                         && !(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._KeyDownUndo() ;
+                }
+                return true ;
         },
 
@@ -666 +666 @@
 
                 FCKUndo.TypesCount++ ;
-                FCKUndo.Changed = 1;
+                FCKUndo.Changed = 1 ;
 
                 if ( FCKUndo.TypesCount > FCKUndo.MaxTypes )
@@ -761 +761 @@
                 else if ( keystrokeValue == 'CustomCut' )
                 {
-                        FCKUndo.SaveUndoStep();
-                        return false;
+                        FCKUndo.SaveUndoStep() ;
+                        return false ;
                 }
         }

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

@@ -29 +29 @@
 FCKUndo.Changed = false ;       // Is the document changed in respect to its initial image?
 FCKUndo.MaxTypes = 25 ;
-FCKUndo.Typing = false;
+CKUndo.Typing = false ;
 
 FCKUndo._GetBookmark = function()
 {
-        if (FCKBrowserInfo.IsIE)
+        if ( FCKBrowserInfo.IsIE )
         {
-                var selection = FCK.EditorDocument.selection;
-                if (selection.type == 'Text')
-                        return selection.createRange().getBookmark();
+                var selection = FCK.EditorDocument.selection ;
+                if ( selection.type == 'Text' )
+                        return selection.createRange().getBookmark() ;
                 else
-                        return null;
+                        return null ;
         }
         else
         {
-                var range = new FCKDomRange(FCK.EditorWindow);
-                range.MoveToSelection();
-                return range.CreateBookmark2();
+                var range = new FCKDomRange( FCK.EditorWindow ) ;
+                range.MoveToSelection() ;
+                return range.CreateBookmark2() ;
         }
 }
 
-FCKUndo._SelectBookmark = function(bookmark)
+FCKUndo._SelectBookmark = function( bookmark )
 {
-        if (! bookmark)
-                return;
-        if (FCKBrowserInfo.IsIE)
+        if ( ! bookmark )
+                return ;
+        if ( FCKBrowserInfo.IsIE )
         {
-                var range = FCK.EditorDocument.selection.createRange();
-                range.moveToBookmark(bookmark);
-                range.select();
+                var range = FCK.EditorDocument.selection.createRange() ;
+                range.moveToBookmark( bookmark ) ;
+                range.select() ;
         }
         else
         {
-                var range = new FCKDomRange(FCK.EditorWindow);
-                if (bookmark instanceof Object)
+                var range = new FCKDomRange( FCK.EditorWindow ) ;
+                if ( bookmark instanceof Object )
                 {
-                        range.MoveToBookmark2(bookmark);
+                        range.MoveToBookmark2( bookmark ) ;
                         try
                         {
                                 // this does not always succeed, there are still some tricky cases where it fails
                                 // e.g. add a special character at end of document, undo, redo -> error
-                                range.Select();
+                                range.Select() ;
                         }
-                        catch (e)
+                        catch ( e )
                         {
                                 // if select restore fails, put the caret at the end of the document
-                                range.MoveToPosition(FCK.EditorDocument.body, 4);
-                                range.Select();
+                                range.MoveToPosition( FCK.EditorDocument.body, 4 ) ;
+                                range.Select() ;
                         }
                 }
@@ -88 +88 @@
         // Assume the editor content is changed when SaveUndoStep() is called after the first time.
         // This also enables the undo button in toolbar.
-        if (FCKUndo.SavedData.length)
-                FCKUndo.Changed = true;
+        if ( FCKUndo.SavedData.length )
+                FCKUndo.Changed = true ;
 
         // Get the HTML content.
@@ -101 +101 @@
                 return ;
         // Save the selection and caret position in the first undo level for the first change.
-        else if (FCKUndo.CurrentIndex == 0 && sHtml == FCKUndo.SavedData[0][0])
+        else if ( FCKUndo.CurrentIndex == 0 && sHtml == FCKUndo.SavedData[0][0] )
         {
-                FCKUndo.SavedData[0][1] = FCKUndo._GetBookmark();
-                return;
+                FCKUndo.SavedData[0][1] = FCKUndo._GetBookmark() ;
+                return ;
         }
 
@@ -167 +167 @@
 
         // Update the editor contents with that step data.
-        if (FCKBrowserInfo.IsIE)
-                FCK.SetInnerHtml(oData[0]);
+        if ( FCKBrowserInfo.IsIE )
+                FCK.SetInnerHtml( oData[0] ) ;
         else
                 FCK.EditorDocument.body.innerHTML = oData[0] ;
 
         // Restore the selection
-        FCKUndo._SelectBookmark(oData[1]);
+        FCKUndo._SelectBookmark( oData[1] ) ;
 
         FCKUndo.TypesCount = 0 ;
-        FCKUndo.Changed = false;
+        FCKUndo.Changed = false ;
         FCKUndo.Typing = false ;
 }