Ticket #2018: 2018_3.patch

_whatsnew.html

@@ -46 +46 @@
         <ul>
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2248">#2248</a>] Calling FCK.InsertHtml( 'nbsp;') was inserting a plain space instead of a non breaking space
                         character.</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>MsWebBrowserControlCompat</strong> has been added
+                        for those who wish to force the #183 fix to be enabled.</li> 
         </ul>
         <p>
         </p>

editor/_source/classes/fckiecleanup.js

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

editor/_source/fckeditorapi.js

@@ -164 +164 @@
 
 function FCKeditorAPI_Cleanup()
 {
-        if ( ! window.FCKUnloadFlag )
+        if ( window.FCKConfig && FCKConfig.MsWebBrowserControlCompat 
+                        && !window.FCKUnloadFlag )
                 return ;
         delete FCKeditorAPI.Instances[ FCK.Name ] ;
 }
 function FCKeditorAPI_ConfirmCleanup()
 {
-        window.FCKUnloadFlag = true ;
+        if ( window.FCKConfig && FCKConfig.MsWebBrowserControlCompat )
+                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 ;
+
+FCKConfig.MsWebBrowserControlCompat = false ;