Changeset 1380

Timestamp:

2008-01-21 08:10:38 (10 months ago)

Author:

martinkou

Message:

Changed the Editor() in fckdialog.html to E as the latter does not cause any memory leak.

Files:

• FCKeditor/branches/features/floating_dialog/editor/fckdialog.html (modified) (7 diffs)

FCKeditor/branches/features/floating_dialog/editor/fckdialog.html

@@ -28 +28 @@
                 <meta name="robots" content="noindex, nofollow" />
                 <script type="text/javascript">
-
+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.
@@ -36 +36 @@
 }
 
-function Editor()
-{
-        return frameElement._DialogArguments.Editor ;
-}
-
 function ParentDialog( dialog )
 {
@@ -56 +51 @@
                 try
                 {
-                        var parentDomain = ( Args().TopWindow || Editor() ).document.domain ;
+                        var parentDomain = ( Args().TopWindow || E ).document.domain ;
 
                         if ( document.domain != parentDomain )
@@ -75 +70 @@
 })() ;
 
-var FCK                         = Editor().FCK ;
-var FCKTools            = Editor().FCKTools ;
-var FCKDomTools         = Editor().FCKDomTools ;
-var FCKDialog           = Editor().FCKDialog ;
-var FCKBrowserInfo      = Editor().FCKBrowserInfo ;
-var FCKConfig           = Editor().FCKConfig ;
+var FCK                         = E.FCK ;
+var FCKTools            = E.FCKTools ;
+var FCKDomTools         = E.FCKDomTools ;
+var FCKDialog           = E.FCKDialog ;
+var FCKBrowserInfo      = E.FCKBrowserInfo ;
+var FCKConfig           = E.FCKConfig ;
 
 // Steal the focus so that the caret would no longer stay in the editor iframe.
@@ -89 +84 @@
 
 // Sets the language direction.
-var langDir = window.document.dir = Editor().FCKLang.Dir ;
+var langDir = window.document.dir = E.FCKLang.Dir ;
 
 // For IE6-, the fck_dialog_ie6.js is loaded, used to fix limitations in the browser.
@@ -622 +617 @@
 
                 // First of all, translate the dialog box contents.
-                Editor().FCKLanguageManager.TranslatePage( document ) ;
+                E.FCKLanguageManager.TranslatePage( document ) ;
 
                 // Create the IFRAME that holds the dialog contents.
@@ -658 +653 @@
                 innerWindow.focus() ;
 
-                return Editor() ;
+                return E ;
         } ;