Ticket #2018: 2018_pre.patch

editor/_source/fckeditorapi.js

@@ -95 +95 @@
                                                 '}' +
                                                 'this.StartNext();' +
                                         '}' +
-                                '}' +
+                                '},' +
+
+                                '_UnloadList : [],' +
+
+                                '_UnloadInstanceInner : function()' +
+                                '{' +
+                                        'var name = FCKeditorAPI._UnloadList.shift(), el = null ;' +
+                                        'if ( ! ( el = document.getElementById( "_FCKInstance_" + name ) ) )' +
+                                                'delete FCKeditorAPI.Instances[name] ;' +
+                                        'else ' +
+                                                'el.removeAttribute( "id" ) ;' +
+                                '},' +
+
+                                '_UnloadInstance : function( name, iframe )' +
+                                '{' +
+                                        'this._UnloadList.push( name ) ;' +
+                                        'iframe.id = "_FCKInstance_" + name ;' +
+                                        'this._Root.setTimeout( this._Root.FCKeditorAPI._UnloadInstanceInner, 100 ) ;' +
+                                '},' +
+
+                                '_Root : window' +
                         '}' ;
 
                 // In IE, the "eval" function is not always available (it works with
@@ -162 +182 @@
         }
 }
 
+// Keep a reference to the frameElement so that it doesn't get deleted in FF3 when we need to check it at unload.
+if ( FCKBrowserInfo.IsGecko )
+        window._FCK_frameElement = frameElement ;
 function FCKeditorAPI_Cleanup()
 {
-        if ( ! window.FCKUnloadFlag )
-                return ;
-        delete FCKeditorAPI.Instances[ FCK.Name ] ;
+        FCKeditorAPI._UnloadInstance( FCK.Name, window._FCK_frameElement || window.frameElement ) ;
 }
-function FCKeditorAPI_ConfirmCleanup()
-{
-        window.FCKUnloadFlag = true ;
-}
 FCKTools.AddEventListener( window, 'unload', FCKeditorAPI_Cleanup ) ;
-FCKTools.AddEventListener( window, 'beforeunload', FCKeditorAPI_ConfirmCleanup) ;