Changeset 1214

Timestamp:

2007-12-17 04:55:50 (9 months ago)

Author:

martinkou

Message:

Changed the throbber appearance delay to 1 second, as the previous 5-second delay seems to be unreasonably long.
Unified the background for throbber to white for all browsers.
Fixed the issue where if a floating dialog is closed when the throbber is running, a JavaScript error would happen some time later.

Files:

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

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

@@ -87 +87 @@
         RefreshContainerSize() ;
         LoadInnerDialog() ;
-        ShowThrobberTimer = setTimeout( ShowThrobber, 5000 ) ;
+        ShowThrobberTimer = setTimeout( ShowThrobber, 1000 ) ;
 
         var titleElement = document.getElementById( 'TitleArea' ) ;
@@ -110 +110 @@
         // First of all, translate the dialog box contents.
         editor.FCKLanguageManager.TranslatePage( document ) ;
-        document.getElementById( 'FrameCell' ).innerHTML = '<iframe id="frmMain" src="' + args.Page + '" name="frmMain" frameborder="0" width="100%" scrolling="auto"></iframe>' ;
+        document.getElementById( 'FrameCell' ).innerHTML = '<iframe id="frmMain" src="' + args.Page + '" name="frmMain" frameborder="0" width="100%" scrolling="auto" style="background-color: white;"></iframe>' ;
 }
 
@@ -140 +140 @@
 function InnerDialogLoaded()
 {
+        // If the dialog has been closed before the iframe is loaded, do nothing.
+        if ( !window.frameElement.parentNode )
+                return ;
+
         HideThrobber() ;
 
@@ -243 +247 @@
 function CloseDialog( dontFireChange )
 {
+        // Points the src to a non-existent location to avoid loading errors later, in case the dialog
+        // haven't been completed loaded at this point.
+        document.getElementById( 'frmMain' ).src = 'javascript: void(0);' ;
+
         if ( !dontFireChange && !editor.FCK.EditMode )
         {