Ticket #593: 593_Proposal2.patch

editor/_source/internals/fck.js

@@ -1 @@
-/*
+/*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
  * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
@@ -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 ) ;
 
@@ -329 +331 @@
 
         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' ) ;
@@ -491 +500 @@
 
                         this.EditingArea.Textarea.focus() ;
 
-                        FCK.Events.FireEvent( 'OnAfterSetHTML' ) ;
+                        //FCK.Events.FireEvent( 'OnAfterSetHTML' ) ;
+                        FCK.OnAfterSetHTML() ;
                 }
 
                 if ( FCKBrowserInfo.IsGecko )

editor/_source/internals/fck_gecko.js

@@ -1 @@
-/*
+/*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
  * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
@@ -488 +488 @@
 
 FCK._ExecCheckEmptyBlock = function()
 {
+        if (FCK.EditMode != FCK_EDITMODE_WYSIWYG)
+                return;
+    
         FCK._FillEmptyBlock( FCK.EditorDocument.body.firstChild ) ;
         var sel = FCKSelection.GetSelection() ;
         if ( !sel || sel.rangeCount < 1 )

fckconfig.js

@@ -1 @@
-/*
+/*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
  * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
@@ -79 +79 @@
 FCKConfig.EMailProtection = 'none' ; // none | encode | function
 FCKConfig.EMailProtectionFunction = 'mt(NAME,DOMAIN,SUBJECT,BODY)' ;
 
+FCKConfig.StartupMode = FCK_EDITMODE_SOURCE;
 FCKConfig.StartupFocus  = false ;
 FCKConfig.ForcePasteAsPlainText = false ;
 FCKConfig.AutoDetectPasteFromWord = true ;      // IE only.