[svn r21984] FS#2867 - The online editor, the simple file manager: Cleaning code added for debugging purposes.

main/inc/lib/fckeditor/editor/fckdialog.html

@@ -718,13 +718,7 @@ var onReadyRegister = function()
 
 	window.Ok = function()
 	{
-		// Try-catch block added temporarily by Ivan Tcholakov, July 11, 2009.
-		try
-		{
-			Selection.EnsureSelection() ;
-		}
-		catch ( ex ) { }
-		//
+		Selection.EnsureSelection() ;
 
 		var frmMain = window.frames["frmMain"] ;
 
@@ -736,13 +730,7 @@ var onReadyRegister = function()
 
 	window.Cancel = function( dontFireChange )
 	{
-		// Try-catch block added temporarily by Ivan Tcholakov, July 11, 2009.
-		try
-		{
-			Selection.EnsureSelection() ;
-		}
-		catch ( ex ) { }
-		//
+		Selection.EnsureSelection() ;
 
 		return CloseDialog( dontFireChange ) ;
 	} ;

main/inc/lib/fckeditor/editor/filemanager/browser/default/browser.html

@@ -75,10 +75,12 @@
 	}
 })() ;
 
-// Establishing access to FCKLang object for making translations.
+// Initialization, establishing access to FCKLang object for making translations.
+var oEditor = null ;
 var FCKLang = [] ;
 if ( window.opener )
 {
+	// The file manager has been opened in a new window.
 	if ( window.opener.FCKLang )
 	{
 		FCKLang = window.opener.FCKLang ;
@@ -86,13 +88,9 @@ if ( window.opener )
 }
 else if ( window.parent )
 {
-	if ( typeof ( window.parent.InnerDialogLoaded ) == 'function' )
-	{
-		if ( window.parent.InnerDialogLoaded().FCKLang )
-		{
-			FCKLang = window.parent.InnerDialogLoaded().FCKLang ;
-		}
-	}
+	// The file manager is inside a dialog.
+	oEditor = window.parent.InnerDialogLoaded() ;
+	FCKLang	= oEditor.FCKLang ;
 }
 
 // Initialization of some language variables.

main/inc/lib/fckeditor/editor/filemanager/browser/default/frmresourceslist.html

@@ -95,27 +95,17 @@ function OpenFile( fileUrl )
 {
 	if ( window.parent.opener )
 	{
-		if ( typeof ( window.parent.opener.SetUrl ) == 'function' )
-		{
-			window.parent.opener.SetUrl( encodeURI( fileUrl ).replace( /#/g, '%23' ) ) ;
-		}
+		// The file manager has been opened in a new window.
+		window.parent.opener.SetUrl( encodeURI( fileUrl ).replace( /#/g, '%23' ) ) ;
 		window.parent.close() ;
 		window.parent.opener.focus() ;
 	}
 	else if ( window.parent.parent )
 	{
-		if ( ( typeof ( window.parent.parent.Args ) == 'function' ) && window.parent.parent.Args().ParentWindow )
-		{
-			if ( typeof ( window.parent.parent.Args().ParentWindow.SetUrl ) == 'function' )
-			{
-				window.parent.parent.Args().ParentWindow.SetUrl( encodeURI( fileUrl ).replace( /#/g, '%23' ) ) ;
-			}
-			window.parent.parent.Args().ParentWindow.focus() ;
-		}
-		if ( typeof ( window.parent.parent.CloseDialog ) == 'function' )
-		{
-			window.parent.parent.CloseDialog() ;
-		}
+		// The file manager is inside a dialog.
+		window.parent.parent.Args().ParentWindow.SetUrl( encodeURI( fileUrl ).replace( /#/g, '%23' ) ) ;
+		window.parent.parent.Args().ParentWindow.focus() ;
+		window.parent.parent.CloseDialog() ;
 	}
 	return true ;
 }