Changeset 1256

Timestamp:

01/02/08 10:19:46 (5 years ago)

Author:

martinkou

Message:

Backtracked on the drag and drop logic as it is found to be slowly leaking upon further tests.
Fixed JavaScript errors upon opening the Find/Replace dialog and the Table dialog.

Location:

FCKeditor/branches/features/floating_dialog

Files:

• editor/dialog/fck_replace.html (modified) (1 diff)
• editor/dialog/fck_table.html (modified) (1 diff)
• editor/fckdialog.html (modified) (6 diffs)
• test_results (modified) (1 diff)

FCKeditor/branches/features/floating_dialog/editor/dialog/fck_replace.html

@@ -32 +32 @@
 var dialog      = window.parent ;
 var oEditor = dialog.InnerDialogLoaded() ;
-var dialogArguments = dialog.dialogArguments ;
+var dialogArguments = dialog.Args() ;
 
 var FCKLang = oEditor.FCKLang ;

FCKeditor/branches/features/floating_dialog/editor/dialog/fck_table.html

@@ -32 +32 @@
 var dialog      = window.parent ;
 var oEditor = dialog.InnerDialogLoaded() ;
-var dialogArguments = dialog.dialogArguments ;
+var dialogArguments = dialog.Args() ;
 
 // Gets the document DOM

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

@@ -436 +436 @@
                 if ( this.readyState != 'complete' )
                         return ;
-                DragAndDrop.RegisterHandlers( this.contentWindow ) ;
+                // DragAndDrop.RegisterHandlers( this.contentWindow ) ;
         }
 
@@ -453 +453 @@
                         // Make the title area draggable.
                         var titleElement = $( 'header' ) ;
-                        titleElement.onmousedown = DragAndDrop.MouseDownHandler ;
+                        // titleElement.onmousedown = DragAndDrop.MouseDownHandler ;
 
                         // Connect mousemove and mouseup events from dialog frame and outer window to dialog dragging logic.
-                        DragAndDrop.RegisterHandlers( window ) ;
-                        DragAndDrop.RegisterHandlers( Args().TopWindow ) ;
+                        // DragAndDrop.RegisterHandlers( window ) ;
+                        // DragAndDrop.RegisterHandlers( Args().TopWindow ) ;
 
                         // Disable the previous dialog if it exists.
@@ -469 +469 @@
                                         {
                                                 var blockerFrame = currentParent.contentWindow.$( 'blocker' ) ;
+                                                /*
                                                 if ( blockerFrame.readyState == 'complete' )
                                                         DragAndDrop.RegisterHandlers( blockerFrame.contentWindow ) ;
                                                 else
                                                         blockerFrame.onreadystatechange = onReadyRegister ;
+                                                */
                                                 currentParent = ParentDialog( currentParent ) ;
                                         }
@@ -481 +483 @@
                                         while ( currentParent )
                                         {
-                                                DragAndDrop.RegisterHandlers( currentParent.contentWindow ) ;
+                                                // DragAndDrop.RegisterHandlers( currentParent.contentWindow ) ;
                                                 currentParent = ParentDialog( currentParent ) ;
                                         }
@@ -491 +493 @@
                         {
                                 var blockerFrame = FCKDialog.GetCover().firstChild ;
+                                /*
                                 if ( blockerFrame.readyState == 'complete' )
                                         DragAndDrop.RegisterHandlers( blockerFrame.contentWindow ) ;
                                 else
                                         blockerFrame.onreadystatechange = onReadyRegister;
+                                */
                         }
                 },
@@ -536 +540 @@
                         Sizer.RefreshContainerSize();
 
-                        DragAndDrop.RegisterHandlers( innerWindow ) ;
+                        // DragAndDrop.RegisterHandlers( innerWindow ) ;
                         
                         innerWindow.focus() ;

FCKeditor/branches/features/floating_dialog/test_results

@@ -9 +9 @@
 6. Added Init(), Throbber(), ResizeContainerSize()/No noticeable increase after 10 minutes. 
 7. Added all resize logic, LoadInnerDialog() and InnerDialogLoaded(), created the Sizer and Main modules/No noticeable increase after 10 minutes.
-8. Added drag and drop handlers/No noticeable increase
-9. Added logic for closing dialogs, cover blocks, disabling and enabling dialogs, and selection handler/No noticeable increase.
+8. Added drag and drop handlers/Slowly increasing
+9. Added logic for closing dialogs, cover blocks, disabling and enabling dialogs, and selection handler/???.