Ticket #2018: 2018.patch

_whatsnew.html

@@ -120 +120 @@
                         when FCKeditor is installed to a different domain.</li> 
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2066">#2066</a>] Added a workaround for a Mac
                         Safari 3.1 browser bug which caused the Fit Window button to give a blank screen.</li> 
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2018">#2018</a>] Reversed the fix for
+                        <a target="_blank" href="http://dev.fckeditor.net/ticket/183">#183</a> which broke FCKeditorAPI's cleanup
+                        logic. A new configuration directive <strong>MsWebBrowserControlOnUnloadKludge</strong> has been added
+                        for those who wish to force the #183 fix to be enabled.</li> 
         </ul>
         <h3>
                 Version 2.6</h3>

editor/_source/classes/fckiecleanup.js

@@ -43 +43 @@
 
 function FCKIECleanup_Cleanup()
 {
-        if ( !this._FCKCleanupObj || !window.FCKUnloadFlag )
+        if ( !this._FCKCleanupObj || ( FCKConfig.MsWebBrowserControlOnUnloadKludge && !window.FCKUnloadFlag ) )
                 return ;
 
         var aItems = this._FCKCleanupObj.Items ;

editor/_source/fckeditorapi.js

@@ -164 +164 @@
 
 function FCKeditorAPI_Cleanup()
 {
-        if ( ! window.FCKUnloadFlag )
+        alert( FCKConfig.MsWebBrowserControlOnUnloadKludge ) ;
+        if ( window.FCKConfig && FCKConfig.MsWebBrowserControlOnUnloadKludge 
+                        && !window.FCKUnloadFlag )
                 return ;
         delete FCKeditorAPI.Instances[ FCK.Name ] ;
 }
 function FCKeditorAPI_ConfirmCleanup()
 {
-        window.FCKUnloadFlag = true ;
+        if ( window.FCKConfig && FCKConfig.MsWebBrowserControlOnUnloadKludge )
+                window.FCKUnloadFlag = true ;
 }
 FCKTools.AddEventListener( window, 'unload', FCKeditorAPI_Cleanup ) ;
 FCKTools.AddEventListener( window, 'beforeunload', FCKeditorAPI_ConfirmCleanup) ;

fckconfig.js

@@ -314 +314 @@
 
 FCKConfig.BackgroundBlockerColor = '#ffffff' ;
 FCKConfig.BackgroundBlockerOpacity = 0.50 ;
+
+// Enable the follow option to prevent FCKeditor from unloading itself
+// when viewed under a WebBrowser control inside an application.
+// NOT RECOMMENDED for normal websites as it causes other problems.
+FCKConfig.MsWebBrowserControlOnUnloadKludge = false ;