[geeklog-cvs] Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_image fck_image.js, 1.7, 1.8 fck_image_preview.html, 1.4, 1.5

Sun May 4 20:35:28 EDT 2008

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

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

Index: fck_image.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_image/fck_image.js,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** fck_image.js	9 Feb 2008 12:53:57 -0000	1.7
--- fck_image.js	5 May 2008 00:35:24 -0000	1.8
***************
*** 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,30 ****
   */
  
! var oEditor		= window.parent.InnerDialogLoaded() ;
  var FCK			= oEditor.FCK ;
  var FCKLang		= oEditor.FCKLang ;
  var FCKConfig	= oEditor.FCKConfig ;
  var FCKDebug	= oEditor.FCKDebug ;
  
  var bImageButton = ( document.location.search.length > 0 && document.location.search.substr(1) == 'ImageButton' ) ;
--- 22,32 ----
   */
  
! var dialog		= window.parent ;
! var oEditor		= dialog.InnerDialogLoaded() ;
  var FCK			= oEditor.FCK ;
  var FCKLang		= oEditor.FCKLang ;
  var FCKConfig	= oEditor.FCKConfig ;
  var FCKDebug	= oEditor.FCKDebug ;
+ var FCKTools	= oEditor.FCKTools ;
  
  var bImageButton = ( document.location.search.length > 0 && document.location.search.substr(1) == 'ImageButton' ) ;
***************
*** 33,46 ****
  
  // Set the dialog tabs.
! window.parent.AddTab( 'Info', FCKLang.DlgImgInfoTab ) ;
  
  if ( !bImageButton && !FCKConfig.ImageDlgHideLink )
! 	window.parent.AddTab( 'Link', FCKLang.DlgImgLinkTab ) ;
  
  if ( FCKConfig.ImageUpload )
! 	window.parent.AddTab( 'Upload', FCKLang.DlgLnkUpload ) ;
  
  if ( !FCKConfig.ImageDlgHideAdvanced )
! 	window.parent.AddTab( 'Advanced', FCKLang.DlgAdvancedTag ) ;
  
  // Function called when a dialog tag is selected.
--- 35,48 ----
  
  // Set the dialog tabs.
! dialog.AddTab( 'Info', FCKLang.DlgImgInfoTab ) ;
  
  if ( !bImageButton && !FCKConfig.ImageDlgHideLink )
! 	dialog.AddTab( 'Link', FCKLang.DlgImgLinkTab ) ;
  
  if ( FCKConfig.ImageUpload )
! 	dialog.AddTab( 'Upload', FCKLang.DlgLnkUpload ) ;
  
  if ( !FCKConfig.ImageDlgHideAdvanced )
! 	dialog.AddTab( 'Advanced', FCKLang.DlgAdvancedTag ) ;
  
  // Function called when a dialog tag is selected.
***************
*** 54,58 ****
  
  // Get the selected image (if available).
! var oImage = FCK.Selection.GetSelectedElement() ;
  
  if ( oImage && oImage.tagName != 'IMG' && !( oImage.tagName == 'INPUT' && oImage.type == 'image' ) )
--- 56,60 ----
  
  // Get the selected image (if available).
! var oImage = dialog.Selection.GetSelectedElement() ;
  
  if ( oImage && oImage.tagName != 'IMG' && !( oImage.tagName == 'INPUT' && oImage.type == 'image' ) )
***************
*** 60,64 ****
  
  // Get the active link.
! var oLink = FCK.Selection.MoveToAncestorNode( 'A' ) ;
  
  var oImageOriginal ;
--- 62,66 ----
  
  // Get the active link.
! var oLink = dialog.Selection.GetSelection().MoveToAncestorNode( 'A' ) ;
  
  var oImageOriginal ;
***************
*** 112,119 ****
  		GetE('frmUpload').action = FCKConfig.ImageUploadURL ;
  
! 	window.parent.SetAutoSize( true ) ;
  
  	// Activate the "OK" button.
! 	window.parent.SetOkButton( true ) ;
  }
  
--- 114,123 ----
  		GetE('frmUpload').action = FCKConfig.ImageUploadURL ;
  
! 	dialog.SetAutoSize( true ) ;
  
  	// Activate the "OK" button.
! 	dialog.SetOkButton( true ) ;
! 
! 	SelectField( 'txtUrl' ) ;
  }
  
***************
*** 198,202 ****
  	if ( GetE('txtUrl').value.length == 0 )
  	{
! 		window.parent.SetSelectedTab( 'Info' ) ;
  		GetE('txtUrl').focus() ;
  
--- 202,206 ----
  	if ( GetE('txtUrl').value.length == 0 )
  	{
! 		dialog.SetSelectedTab( 'Info' ) ;
  		GetE('txtUrl').focus() ;
  
***************
*** 381,384 ****
--- 385,393 ----
  {
  	if ( ! oImageOriginal ) return ;
+ 	if ( oEditor.FCKBrowserInfo.IsGecko && !oImageOriginal.complete )
+ 	{
+ 		setTimeout( ResetSizes, 50 ) ;
+ 		return ;
+ 	}
  
  	GetE('txtWidth').value  = oImageOriginal.width ;
***************
*** 434,438 ****
  	}
  
! 	window.parent.SetSelectedTab( 'Info' ) ;
  }
  
--- 443,447 ----
  	}
  
! 	dialog.SetSelectedTab( 'Info' ) ;
  }
  
***************
*** 459,462 ****
--- 468,474 ----
  			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 ) ;

Index: fck_image_preview.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_image/fck_image_preview.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** fck_image_preview.html	9 Feb 2008 12:53:57 -0000	1.4
--- fck_image_preview.html	5 May 2008 00:35:24 -0000	1.5
***************
*** 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 ==
***************
*** 29,37 ****
  	<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 type="text/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 )
--- 29,41 ----
  	<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 type="text/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 )
***************
*** 48,66 ****
  </head>
  <body style="color: #000000; background-color: #ffffff">
! 	<a id="lnkPreview" onclick="return false;" style="cursor: default">
! 		<img id="imgPreview" onload="window.parent.UpdateOriginal();" style="display: none" /></a>Lorem
! 	ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas feugiat consequat diam.
! 	Maecenas metus. Vivamus diam purus, cursus a, commodo non, facilisis vitae, nulla.
! 	Aenean dictum lacinia tortor. Nunc iaculis, nibh non iaculis aliquam, orci felis
! 	euismod neque, sed ornare massa mauris sed velit. Nulla pretium mi et risus. Fusce
! 	mi pede, tempor id, cursus ac, ullamcorper nec, enim. Sed tortor. Curabitur molestie.
! 	Duis velit augue, condimentum at, ultrices a, luctus ut, orci. Donec pellentesque
! 	egestas eros. Integer cursus, augue in cursus faucibus, eros pede bibendum sem,
! 	in tempus tellus justo quis ligula. Etiam eget tortor. Vestibulum rutrum, est ut
! 	placerat elementum, lectus nisl aliquam velit, tempor aliquam eros nunc nonummy
! 	metus. In eros metus, gravida a, gravida sed, lobortis id, turpis. Ut ultrices,
! 	ipsum at venenatis fringilla, sem nulla lacinia tellus, eget aliquet turpis mauris
! 	non enim. Nam turpis. Suspendisse lacinia. Curabitur ac tortor ut ipsum egestas
! 	elementum. Nunc imperdiet gravida mauris.
  </body>
  </html>
--- 52,72 ----
  </head>
  <body style="color: #000000; background-color: #ffffff">
! 	<div>
! 		<a id="lnkPreview" onclick="return false;" style="cursor: default">
! 			<img id="imgPreview" onload="window.parent.UpdateOriginal();"
! 				style="display: none" alt="" /></a>Lorem ipsum dolor sit amet, consectetuer adipiscing
! 		elit. Maecenas feugiat consequat diam. Maecenas metus. Vivamus diam purus, cursus
! 		a, commodo non, facilisis vitae, nulla. Aenean dictum lacinia tortor. Nunc iaculis,
! 		nibh non iaculis aliquam, orci felis euismod neque, sed ornare massa mauris sed
! 		velit. Nulla pretium mi et risus. Fusce mi pede, tempor id, cursus ac, ullamcorper
! 		nec, enim. Sed tortor. Curabitur molestie. Duis velit augue, condimentum at, ultrices
! 		a, luctus ut, orci. Donec pellentesque egestas eros. Integer cursus, augue in cursus
! 		faucibus, eros pede bibendum sem, in tempus tellus justo quis ligula. Etiam eget
! 		tortor. Vestibulum rutrum, est ut placerat elementum, lectus nisl aliquam velit,
! 		tempor aliquam eros nunc nonummy metus. In eros metus, gravida a, gravida sed, lobortis
! 		id, turpis. Ut ultrices, ipsum at venenatis fringilla, sem nulla lacinia tellus,
! 		eget aliquet turpis mauris non enim. Nam turpis. Suspendisse lacinia. Curabitur
! 		ac tortor ut ipsum egestas elementum. Nunc imperdiet gravida mauris.
! 	</div>
  </body>
  </html>