Changeset 1366

Timestamp:

2008-01-19 12:11:15 (9 months ago)

Author:

fredck

Message:

The editor was loosing the selection and the focus (OnBlur fired) when clicking the "Cancel" button.
What about www.skype.com leaking memory ;)

Files:

• FCKeditor/branches/features/floating_dialog/editor/_source/internals/fckdialog.js (modified) (2 diffs)

FCKeditor/branches/features/floating_dialog/editor/_source/internals/fckdialog.js

@@ -137 +137 @@
 
                         // Dummy URL for testing whether the code in fckdialog.js alone leaks memory.
-                        // dialog.src = 'http://www.skype.com';
+                        // dialog.src = 'about:blank';
 
                         dialog.frameBorder = 0 ;
@@ -171 +171 @@
                         FCKDomTools.RemoveNode( dialog ) ;
 
-                        // Pop the dialog from the dialog stack, and disable dialog mode if the stack is empty.
-                        if ( dialog._ParentDialog )
+                        if ( dialog._ParentDialog )             // Nested Dialog.
                         {
                                 topDialog = dialog._ParentDialog ;
                                 dialog._ParentDialog.contentWindow.SetEnabled( true ) ;
                         }
-                        else
-                        {
+                        else                                                    // First Dialog.
+                        {
+                                FCK.Focus() ;
                                 this.HideMainCover() ;
                                 topDialog = null ;