[geeklog-cvs] Geeklog-1.x/public_html/fckeditor/editor/_source fckconstants.js, 1.3, 1.4 fckeditorapi.js, 1.4, 1.5 fckjscoreextensions.js, 1.3, 1.4 fckscriptloader.js, 1.1, 1.2

[Blaine Lang]

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

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

Index: fckscriptloader.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/fckscriptloader.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** fckscriptloader.js	9 Feb 2008 12:53:57 -0000	1.1
--- fckscriptloader.js	5 May 2008 00:35:24 -0000	1.2
***************
*** 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 ==
***************
*** 41,44 ****
--- 41,46 ----
  		return ;
  
+ 	FCKScriptLoader._LoadedScripts[ scriptName ] = true ;
+ 
  	var oScriptInfo = this._Scripts[ scriptName ] ;
  
***************
*** 66,71 ****
  			this._LoadScript( sBaseScriptName + '_gecko.js' ) ;
  	}
- 
- 	FCKScriptLoader._LoadedScripts[ scriptName ] = true ;
  }
  
--- 68,71 ----
***************
*** 111,115 ****
  FCKScriptLoader.AddScript( 'FCKConfig'			, 'internals/'	, ['FCKBrowserInfo','FCKConstants'] ) ;
  FCKScriptLoader.AddScript( 'FCKDebug'			, 'internals/'	, ['FCKConfig'] ) ;
! FCKScriptLoader.AddScript( 'FCKDomTools'		, 'internals/'	, ['FCKJSCoreExtensions','FCKBrowserInfo','FCKTools'], FCK_GENERIC ) ;
  FCKScriptLoader.AddScript( 'FCKListsLib'		, 'internals/' ) ;
  FCKScriptLoader.AddScript( 'FCKListHandler'		, 'internals/'	, ['FCKConfig', 'FCKDocumentFragment', 'FCKJSCoreExtensions','FCKDomTools'], FCK_GENERIC ) ;
--- 111,115 ----
  FCKScriptLoader.AddScript( 'FCKConfig'			, 'internals/'	, ['FCKBrowserInfo','FCKConstants'] ) ;
  FCKScriptLoader.AddScript( 'FCKDebug'			, 'internals/'	, ['FCKConfig'] ) ;
! FCKScriptLoader.AddScript( 'FCKDomTools'		, 'internals/'	, ['FCKJSCoreExtensions','FCKBrowserInfo','FCKTools','FCKDomRange'], FCK_GENERIC ) ;
  FCKScriptLoader.AddScript( 'FCKListsLib'		, 'internals/' ) ;
  FCKScriptLoader.AddScript( 'FCKListHandler'		, 'internals/'	, ['FCKConfig', 'FCKDocumentFragment', 'FCKJSCoreExtensions','FCKDomTools'], FCK_GENERIC ) ;

Index: fckjscoreextensions.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/fckjscoreextensions.js,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** fckjscoreextensions.js	9 Feb 2008 12:53:57 -0000	1.3
--- fckjscoreextensions.js	5 May 2008 00:35:24 -0000	1.4
***************
*** 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 ==
***************
*** 139,146 ****
  	if ( typeof replacement == 'function' )
  	{
! 		return this.replace( regExp, 
! 			function() 
! 			{ 
! 				return replacement.apply( thisObj || this, arguments ) ; 
  			} ) ;
  	}
--- 139,146 ----
  	if ( typeof replacement == 'function' )
  	{
! 		return this.replace( regExp,
! 			function()
! 			{
! 				return replacement.apply( thisObj || this, arguments ) ;
  			} ) ;
  	}

Index: fckeditorapi.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/fckeditorapi.js,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** fckeditorapi.js	9 Feb 2008 12:53:57 -0000	1.4
--- fckeditorapi.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 ==
***************
*** 36,58 ****
  		// from a freed script" error).
  
! 		// Note: we check the existence of oEditor.GetParentForm because some external 
! 		// code (like JSON) can extend the Object prototype and we get then extra oEditor 
  		// objects that aren't really FCKeditor instances.
  		var sScript =
! 			'var FCKeditorAPI = {' +
! 				'Version : "2.5.1",' +
! 				'VersionBuild : "17566",' +
! 				'__Instances : new Object(),' +
  
  				'GetInstance : function( name )' +
  				'{' +
! 					'return this.__Instances[ name ];' +
  				'},' +
  
  				'_FormSubmit : function()' +
  				'{' +
! 					'for ( var name in FCKeditorAPI.__Instances )' +
  					'{' +
! 						'var oEditor = FCKeditorAPI.__Instances[ name ] ;' +
  						'if ( oEditor.GetParentForm && oEditor.GetParentForm() == this )' +
  							'oEditor.UpdateLinkedField() ;' +
--- 36,58 ----
  		// from a freed script" error).
  
! 		// Note: we check the existence of oEditor.GetParentForm because some external
! 		// code (like JSON) can extend the Object prototype and we get then extra oEditor
  		// objects that aren't really FCKeditor instances.
  		var sScript =
! 			'window.FCKeditorAPI = {' +
! 				'Version : "2.6",' +
! 				'VersionBuild : "18638",' +
! 				'Instances : new Object(),' +
  
  				'GetInstance : function( name )' +
  				'{' +
! 					'return this.Instances[ name ];' +
  				'},' +
  
  				'_FormSubmit : function()' +
  				'{' +
! 					'for ( var name in FCKeditorAPI.Instances )' +
  					'{' +
! 						'var oEditor = FCKeditorAPI.Instances[ name ] ;' +
  						'if ( oEditor.GetParentForm && oEditor.GetParentForm() == this )' +
  							'oEditor.UpdateLinkedField() ;' +
***************
*** 112,115 ****
--- 112,119 ----
  				eval.call( oParentWindow, sScript ) ;
  			}
+ 			else if( FCKBrowserInfo.IsAIR )
+ 			{
+ 				FCKAdobeAIR.FCKeditorAPI_Evaluate( oParentWindow, sScript ) ;
+ 			}
  			else if ( FCKBrowserInfo.IsSafari || FCKBrowserInfo.IsGecko19 )
  			{
***************
*** 126,133 ****
  
  		FCKeditorAPI = oParentWindow.FCKeditorAPI ;
  	}
  
  	// Add the current instance to the FCKeditorAPI's instances collection.
! 	FCKeditorAPI.__Instances[ FCK.Name ] = FCK ;
  }
  
--- 130,141 ----
  
  		FCKeditorAPI = oParentWindow.FCKeditorAPI ;
+ 
+ 		// The __Instances properly has been changed to the public Instances,
+ 		// but we should still have the "deprecated" version of it.
+ 		FCKeditorAPI.__Instances = FCKeditorAPI.Instances ;
  	}
  
  	// Add the current instance to the FCKeditorAPI's instances collection.
! 	FCKeditorAPI.Instances[ FCK.Name ] = FCK ;
  }
  
***************
*** 159,163 ****
  	if ( ! window.FCKUnloadFlag )
  		return ;
! 	delete FCKeditorAPI.__Instances[ FCK.Name ] ;
  }
  function FCKeditorAPI_ConfirmCleanup()
--- 167,171 ----
  	if ( ! window.FCKUnloadFlag )
  		return ;
! 	delete FCKeditorAPI.Instances[ FCK.Name ] ;
  }
  function FCKeditorAPI_ConfirmCleanup()
***************
*** 165,168 ****
  	window.FCKUnloadFlag = true ;
  }
! FCKTools.AddEventListener( window, 'unload', FCKeditorAPI_Cleanup ) ;	
  FCKTools.AddEventListener( window, 'beforeunload', FCKeditorAPI_ConfirmCleanup) ;
--- 173,176 ----
  	window.FCKUnloadFlag = true ;
  }
! FCKTools.AddEventListener( window, 'unload', FCKeditorAPI_Cleanup ) ;
  FCKTools.AddEventListener( window, 'beforeunload', FCKeditorAPI_ConfirmCleanup) ;

Index: fckconstants.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/fckconstants.js,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** fckconstants.js	9 Feb 2008 12:53:57 -0000	1.3
--- fckconstants.js	5 May 2008 00:35:24 -0000	1.4
***************
*** 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 ==