Ticket #593: 593_Proposal.patch

editor/_source/internals/fck.js

@@ -114 +114 @@
                 this.EditingArea = new FCKEditingArea( document.getElementById( 'xEditingArea' ) ) ;
                 this.EditingArea.FFSpellChecker = FCKConfig.FirefoxSpellChecker ;
 
+                FCK.EditMode = FCKConfig.StartupMode ;
+
                 // Set the editor's startup contents.
                 this.SetData( this.GetLinkedFieldValue(), true ) ;
 
@@ -322 +324 @@
 
         OnAfterSetHTML : function()
         {
-                FCKDocumentProcessor.Process( FCK.EditorDocument ) ;
-                FCKUndo.SaveUndoStep() ;
+                if ( FCK.EditMode == FCK_EDITMODE_WYSIWYG )
+                {
+                        FCKDocumentProcessor.Process( FCK.EditorDocument ) ;
+                        FCKUndo.SaveUndoStep() ;
+                }
 
+                // Check if it is not a startup call, otherwise complete the startup.
+                if ( FCK.Status != FCK_STATUS_NOTLOADED )
+                        FCK.SetStatus( FCK_STATUS_ACTIVE ) ;
+
                 FCK.Events.FireEvent( 'OnSelectionChange' ) ;
                 FCK.Events.FireEvent( 'OnAfterSetHTML' ) ;
         },
@@ -478 +487 @@
 
                         this.EditingArea.Textarea.focus() ;
 
-                        FCK.Events.FireEvent( 'OnAfterSetHTML' ) ;
+                        FCK.OnAfterSetHTML() ;
                 }
 
                 if ( FCKBrowserInfo.IsGecko )
@@ -960 +969 @@
 
         // Restore show blocks status.
         FCKCommands.GetCommand( 'ShowBlocks' ).RestoreState() ;
-
-        // Check if it is not a startup call, otherwise complete the startup.
-        if ( FCK.Status != FCK_STATUS_NOTLOADED )
-                return ;
-
-        FCK.SetStatus( FCK_STATUS_ACTIVE ) ;
 }
 
 function _FCK_GetEditorAreaStyleTags()

fckconfig.js

@@ -73 +73 @@
 FCKConfig.FormatOutput          = true ;
 FCKConfig.FormatIndentator      = '    ' ;
 
-FCKConfig.StartupFocus  = false ;
+FCKConfig.StartupMode = FCK_EDITMODE_WYSIWYG ;  // FCK_EDITMODE_WYSIWYG = 0 || FCK_EDITMODE_SOURCE = 1
+FCKConfig.StartupFocus = false ;
 FCKConfig.ForcePasteAsPlainText = false ;
 FCKConfig.AutoDetectPasteFromWord = true ;      // IE only.
 FCKConfig.ShowDropDialog = true ;