[geeklog-cvs] Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_link fck_link.js, 1.6, 1.7

[Blaine Lang]

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

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

Index: fck_link.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_link/fck_link.js,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** fck_link.js	9 Feb 2008 12:53:58 -0000	1.6
--- fck_link.js	5 May 2008 00:35:24 -0000	1.7
***************
*** 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,26 ****
   */
  
! var oEditor		= window.parent.InnerDialogLoaded() ;
  var FCK			= oEditor.FCK ;
  var FCKLang		= oEditor.FCKLang ;
--- 22,28 ----
   */
  
! var dialog	= window.parent ;
! var oEditor = dialog.InnerDialogLoaded() ;
! 
  var FCK			= oEditor.FCK ;
  var FCKLang		= oEditor.FCKLang ;
***************
*** 32,45 ****
  
  // Set the dialog tabs.
! window.parent.AddTab( 'Info', FCKLang.DlgLnkInfoTab ) ;
  
  if ( !FCKConfig.LinkDlgHideTarget )
! 	window.parent.AddTab( 'Target', FCKLang.DlgLnkTargetTab, true ) ;
  
  if ( FCKConfig.LinkUpload )
! 	window.parent.AddTab( 'Upload', FCKLang.DlgLnkUpload, true ) ;
  
  if ( !FCKConfig.LinkDlgHideAdvanced )
! 	window.parent.AddTab( 'Advanced', FCKLang.DlgAdvancedTag ) ;
  
  // Function called when a dialog tag is selected.
--- 34,47 ----
  
  // Set the dialog tabs.
! dialog.AddTab( 'Info', FCKLang.DlgLnkInfoTab ) ;
  
  if ( !FCKConfig.LinkDlgHideTarget )
! 	dialog.AddTab( 'Target', FCKLang.DlgLnkTargetTab, true ) ;
  
  if ( FCKConfig.LinkUpload )
! 	dialog.AddTab( 'Upload', FCKLang.DlgLnkUpload, true ) ;
  
  if ( !FCKConfig.LinkDlgHideAdvanced )
! 	dialog.AddTab( 'Advanced', FCKLang.DlgAdvancedTag ) ;
  
  // Function called when a dialog tag is selected.
***************
*** 51,55 ****
  	ShowE('divAttribs'	, ( tabCode == 'Advanced' ) ) ;
  
! 	window.parent.SetAutoSize( true ) ;
  }
  
--- 53,57 ----
  	ShowE('divAttribs'	, ( tabCode == 'Advanced' ) ) ;
  
! 	dialog.SetAutoSize( true ) ;
  }
  
***************
*** 125,129 ****
  
  // oLink: The actual selected link in the editor.
! var oLink = FCK.Selection.MoveToAncestorNode( 'A' ) ;
  if ( oLink )
  	FCK.Selection.SelectNode( oLink ) ;
--- 127,131 ----
  
  // oLink: The actual selected link in the editor.
! var oLink = dialog.Selection.GetSelection().MoveToAncestorNode( 'A' ) ;
  if ( oLink )
  	FCK.Selection.SelectNode( oLink ) ;
***************
*** 157,161 ****
  
  	// Activate the "OK" button.
! 	window.parent.SetOkButton( true ) ;
  }
  
--- 159,179 ----
  
  	// Activate the "OK" button.
! 	dialog.SetOkButton( true ) ;
! 
! 	// Select the first field.
! 	switch( GetE('cmbLinkType').value )
! 	{
! 		case 'url' :
! 			SelectField( 'txtUrl' ) ;
! 			break ;
! 		case 'email' :
! 			SelectField( 'txtEMailAddress' ) ;
! 			break ;
! 		case 'anchor' :
! 			if ( GetE('divSelAnchor').style.display != 'none' )
! 				SelectField( 'cmbAnchorName' ) ;
! 			else
! 				SelectField( 'cmbLinkType' ) ;
! 	}
  }
  
***************
*** 225,229 ****
  
  	// Accessible popups, the popup data is in the onclick attribute
! 	if ( !oPopupMatch ) 
  	{
  		var onclick = oLink.getAttribute( 'onclick_fckprotectedatt' ) ;
--- 243,247 ----
  
  	// Accessible popups, the popup data is in the onclick attribute
! 	if ( !oPopupMatch )
  	{
  		var onclick = oLink.getAttribute( 'onclick_fckprotectedatt' ) ;
***************
*** 232,236 ****
  			// Decode the protected string
  			onclick = decodeURIComponent( onclick ) ;
! 			
  			oPopupMatch = oRegex.OnClickPopup.exec( onclick ) ;
  			if( oPopupMatch )
--- 250,254 ----
  			// Decode the protected string
  			onclick = decodeURIComponent( onclick ) ;
! 
  			oPopupMatch = oRegex.OnClickPopup.exec( onclick ) ;
  			if( oPopupMatch )
***************
*** 339,352 ****
  
  	if ( !FCKConfig.LinkDlgHideTarget )
! 		window.parent.SetTabVisibility( 'Target'	, (linkType == 'url') ) ;
  
  	if ( FCKConfig.LinkUpload )
! 		window.parent.SetTabVisibility( 'Upload'	, (linkType == 'url') ) ;
  
  	if ( !FCKConfig.LinkDlgHideAdvanced )
! 		window.parent.SetTabVisibility( 'Advanced'	, (linkType != 'anchor' || bHasAnchors) ) ;
  
  	if ( linkType == 'email' )
! 		window.parent.SetAutoSize( true ) ;
  }
  
--- 357,370 ----
  
  	if ( !FCKConfig.LinkDlgHideTarget )
! 		dialog.SetTabVisibility( 'Target'	, (linkType == 'url') ) ;
  
  	if ( FCKConfig.LinkUpload )
! 		dialog.SetTabVisibility( 'Upload'	, (linkType == 'url') ) ;
  
  	if ( !FCKConfig.LinkDlgHideAdvanced )
! 		dialog.SetTabVisibility( 'Advanced'	, (linkType != 'anchor' || bHasAnchors) ) ;
  
  	if ( linkType == 'email' )
! 		dialog.SetAutoSize( true ) ;
  }
  
***************
*** 372,376 ****
  
  	if ( targetType == 'popup' )
! 		window.parent.SetAutoSize( true ) ;
  }
  
--- 390,394 ----
  
  	if ( targetType == 'popup' )
! 		dialog.SetAutoSize( true ) ;
  }
  
***************
*** 575,579 ****
  				// Decode the protected string
  				onclick = decodeURIComponent( onclick ) ;
! 			
  				if( oRegex.OnClickPopup.test( onclick ) )
  					SetAttribute( oLink, 'onclick_fckprotectedatt', '' ) ;
--- 593,597 ----
  				// Decode the protected string
  				onclick = decodeURIComponent( onclick ) ;
! 
  				if( oRegex.OnClickPopup.test( onclick ) )
  					SetAttribute( oLink, 'onclick_fckprotectedatt', '' ) ;
***************
*** 635,639 ****
  	document.getElementById('txtUrl').value = url ;
  	OnUrlChange() ;
! 	window.parent.SetSelectedTab( 'Info' ) ;
  }
  
--- 653,657 ----
  	document.getElementById('txtUrl').value = url ;
  	OnUrlChange() ;
! 	dialog.SetSelectedTab( 'Info' ) ;
  }
  
***************
*** 660,663 ****
--- 678,684 ----
  			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 ) ;
***************
*** 695,699 ****
  {
  	var target = FCKConfig.DefaultLinkTarget || '' ;
! 	
  	if ( oLink || target.length == 0 )
  		return ;
--- 716,720 ----
  {
  	var target = FCKConfig.DefaultLinkTarget || '' ;
! 
  	if ( oLink || target.length == 0 )
  		return ;
***************
*** 711,715 ****
  			break ;
  	}
! 	
  	GetE('txtTargetFrame').value = target ;
  }
--- 732,736 ----
  			break ;
  	}
! 
  	GetE('txtTargetFrame').value = target ;
  }