Changeset 2095

Timestamp:

2008-06-19 06:34:43 (6 months ago)

Author:

martinkou

Message:

Fixed #2018 : Reversed the fix for #183 which broke FCKeditorAPI's cleanup logic. A new configuration directive MsWebBrowserControlCompat has been added for those who wish to force the #183 fix to be enabled.

Location:

FCKeditor/trunk

Files:

• editor/_source/classes/fckiecleanup.js (modified) (1 diff)
• editor/_source/fckeditorapi.js (modified) (2 diffs)
• fckconfig.js (modified) (1 diff)
• _whatsnew.html (modified) (1 diff)

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

@@ -44 +44 @@
 function FCKIECleanup_Cleanup()
 {
-        if ( !this._FCKCleanupObj || !window.FCKUnloadFlag )
+        if ( !this._FCKCleanupObj || ( FCKConfig.MsWebBrowserControlCompat && !window.FCKUnloadFlag ) )
                 return ;
 

FCKeditor/trunk/editor/_source/fckeditorapi.js

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

FCKeditor/trunk/fckconfig.js

@@ -315 +315 @@
 FCKConfig.BackgroundBlockerColor = '#ffffff' ;
 FCKConfig.BackgroundBlockerOpacity = 0.50 ;
+
+FCKConfig.MsWebBrowserControlCompat = false ;

FCKeditor/trunk/_whatsnew.html

@@ -56 +56 @@
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2127">#2127</a>] Changed floating dialogs to use
                         fixed positioning so that they are no longer affected by scrolling.</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>