[geeklog-cvs] Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_flash fck_flash.js, 1.4, 1.5 fck_flash_preview.html, 1.3, 1.4

[Blaine Lang]

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_flash
In directory qs1489.pair.com:/tmp/cvs-serv85146/editor/dialog/fck_flash

Modified Files:
	fck_flash.js fck_flash_preview.html 
Log Message:
Upgraded the FCKeditor to version 2.6 Final - latest release April 7/08

Index: fck_flash_preview.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_flash/fck_flash_preview.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** fck_flash_preview.html	9 Feb 2008 12:53:57 -0000	1.3
--- fck_flash_preview.html	5 May 2008 00:35:24 -0000	1.4
***************
*** 2,6 ****
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 27,35 ****
  		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
  		<meta name="robots" content="noindex, nofollow">
! 		<link href="../common/fck_dialog_common.css" rel="stylesheet" type="text/css" />
  		<script language="javascript">
  
  // Sets the Skin CSS
! document.write( '<link href="' + window.parent.FCKConfig.SkinPath + 'fck_dialog.css" type="text/css" rel="stylesheet">' ) ;
  
  if ( window.parent.FCKConfig.BaseHref.length > 0 )
--- 27,39 ----
  		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
  		<meta name="robots" content="noindex, nofollow">
! 		<script src="../common/fck_dialog_common.js" type="text/javascript"></script>
  		<script language="javascript">
  
+ var FCKTools	= window.parent.FCKTools ;
+ var FCKConfig	= window.parent.FCKConfig ;
+ 
  // Sets the Skin CSS
! document.write( FCKTools.GetStyleHtml( FCKConfig.SkinDialogCSS ) ) ;
! document.write( FCKTools.GetStyleHtml( GetCommonDialogCss( '../' ) ) ) ;
  
  if ( window.parent.FCKConfig.BaseHref.length > 0 )

Index: fck_flash.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_flash/fck_flash.js,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** fck_flash.js	9 Feb 2008 12:53:57 -0000	1.4
--- fck_flash.js	5 May 2008 00:35:24 -0000	1.5
***************
*** 1,5 ****
  /*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  /*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 22,40 ****
   */
  
! var oEditor		= window.parent.InnerDialogLoaded() ;
  var FCK			= oEditor.FCK ;
  var FCKLang		= oEditor.FCKLang ;
  var FCKConfig	= oEditor.FCKConfig ;
  
  //#### Dialog Tabs
  
  // Set the dialog tabs.
! window.parent.AddTab( 'Info', oEditor.FCKLang.DlgInfoTab ) ;
  
  if ( FCKConfig.FlashUpload )
! 	window.parent.AddTab( 'Upload', FCKLang.DlgLnkUpload ) ;
  
  if ( !FCKConfig.FlashDlgHideAdvanced )
! 	window.parent.AddTab( 'Advanced', oEditor.FCKLang.DlgAdvancedTag ) ;
  
  // Function called when a dialog tag is selected.
--- 22,42 ----
   */
  
! var dialog		= window.parent ;
! var oEditor		= dialog.InnerDialogLoaded() ;
  var FCK			= oEditor.FCK ;
  var FCKLang		= oEditor.FCKLang ;
  var FCKConfig	= oEditor.FCKConfig ;
+ var FCKTools	= oEditor.FCKTools ;
  
  //#### Dialog Tabs
  
  // Set the dialog tabs.
! dialog.AddTab( 'Info', oEditor.FCKLang.DlgInfoTab ) ;
  
  if ( FCKConfig.FlashUpload )
! 	dialog.AddTab( 'Upload', FCKLang.DlgLnkUpload ) ;
  
  if ( !FCKConfig.FlashDlgHideAdvanced )
! 	dialog.AddTab( 'Advanced', oEditor.FCKLang.DlgAdvancedTag ) ;
  
  // Function called when a dialog tag is selected.
***************
*** 47,51 ****
  
  // Get the selected flash embed (if available).
! var oFakeImage = FCK.Selection.GetSelectedElement() ;
  var oEmbed ;
  
--- 49,53 ----
  
  // Get the selected flash embed (if available).
! var oFakeImage = dialog.Selection.GetSelectedElement() ;
  var oEmbed ;
  
***************
*** 73,80 ****
  		GetE('frmUpload').action = FCKConfig.FlashUploadURL ;
  
! 	window.parent.SetAutoSize( true ) ;
  
  	// Activate the "OK" button.
! 	window.parent.SetOkButton( true ) ;
  }
  
--- 75,84 ----
  		GetE('frmUpload').action = FCKConfig.FlashUploadURL ;
  
! 	dialog.SetAutoSize( true ) ;
  
  	// Activate the "OK" button.
! 	dialog.SetOkButton( true ) ;
! 
! 	SelectField( 'txtUrl' ) ;
  }
  
***************
*** 115,119 ****
  	if ( GetE('txtUrl').value.length == 0 )
  	{
! 		window.parent.SetSelectedTab( 'Info' ) ;
  		GetE('txtUrl').focus() ;
  
--- 119,123 ----
  	if ( GetE('txtUrl').value.length == 0 )
  	{
! 		dialog.SetSelectedTab( 'Info' ) ;
  		GetE('txtUrl').focus() ;
  
***************
*** 138,142 ****
  	}
  
! 	oEditor.FCKFlashProcessor.RefreshView( oFakeImage, oEmbed ) ;
  
  	return true ;
--- 142,146 ----
  	}
  
! 	oEditor.FCKEmbedAndObjectProcessor.RefreshView( oFakeImage, oEmbed ) ;
  
  	return true ;
***************
*** 228,232 ****
  	UpdatePreview() ;
  
! 	window.parent.SetSelectedTab( 'Info' ) ;
  }
  
--- 232,236 ----
  	UpdatePreview() ;
  
! 	dialog.SetSelectedTab( 'Info' ) ;
  }
  
***************
*** 253,256 ****
--- 257,263 ----
  			alert( "Security error. You probably don't have enough permissions to upload. Please check your server." ) ;
  			return ;
+ 		case 500 :
+ 			alert( 'The connector is disabled' ) ;
+ 			break ;
  		default :
  			alert( 'Error on file upload. Error number: ' + errorNumber ) ;