Changeset 1391

Timestamp:

2008-01-23 10:05:13 (9 months ago)

Author:

martinkou

Message:

Fixed some more JavaScript errors with FCKDialog manual test page.

Location:

FCKeditor/branches/features/floating_dialog

Files:

• editor/fckdialog.html (modified) (1 diff)
• _test/manual/fckdialog/test1.html (modified) (1 diff)

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

@@ -686 +686 @@
                 // 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.
-                $( 'frmMain' ).src = FCKTools.GetVoidUrl() ;
+                if ( $( 'frmMain' ) )
+                        $( 'frmMain' ).src = FCKTools.GetVoidUrl() ;
 
                 if ( !dontFireChange && !FCK.EditMode )

FCKeditor/branches/features/floating_dialog/_test/manual/fckdialog/test1.html

@@ -79 +79 @@
                 for ( var i = 0 ; i < iframes.length ; i++ )
                 {
-                        if ( iframes[i].src.search( 'fckdialog.html' ) != -1 )
+                        if ( iframes[i].src.search( 'fckdialog.html' ) != -1 && iframes[i].contentWindow && iframes[i].contentWindow.CloseDialog )
                                 iframes[i].contentWindow.CloseDialog() ;
                 }