Ticket #1898: 1898_pre.patch

editor/_source/internals/fckdialog.js

@@ -189 +189 @@
                                         FCK.Focus() ;
 
                                 this.HideMainCover() ;
-                                topDialog = null ;
+
+                                // Bug #1898: Setting "topDialog = null" directly here causes IE6 to crash.
+                                FCKTools.RunFunction( function(){topDialog = null ;}, this, [], topWindow );
                                 this.SelectionData = null ;
                         }
                 },

editor/fckdialog.html

@@ -27 +27 @@
                 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
                 <meta name="robots" content="noindex, nofollow" />
                 <script type="text/javascript">
-
-var E = frameElement._DialogArguments.Editor ;
-
-// It seems referencing to frameElement._DialogArguments directly would lead to memory leaks in IE.
-// So let's use functions to access its members instead.
-function Args()
-{
-        return frameElement._DialogArguments ;
-}
-
-function ParentDialog( dialog )
-{
-        return dialog ? dialog._ParentDialog : frameElement._ParentDialog ;
-}
-
 // Domain relaxation logic.
 (function()
 {
@@ -71 +56 @@
         }
 })() ;
 
+var E = frameElement._DialogArguments.Editor ;
+
+// It seems referencing to frameElement._DialogArguments directly would lead to memory leaks in IE.
+// So let's use functions to access its members instead.
+function Args()
+{
+        return frameElement._DialogArguments ;
+}
+
+function ParentDialog( dialog )
+{
+        return dialog ? dialog._ParentDialog : frameElement._ParentDialog ;
+}
+
 var FCK                         = E.FCK ;
 var FCKTools            = E.FCKTools ;
 var FCKDomTools         = E.FCKDomTools ;