[geeklog-cvs] Geeklog-1.x/public_html/fckeditor/editor/filemanager/browser/default/js common.js, 1.5, 1.6 fckxml.js, 1.4, 1.5

[Blaine Lang]

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/browser/default/js
In directory qs1489.pair.com:/tmp/cvs-serv4567/editor/filemanager/browser/default/js

Modified Files:
	common.js fckxml.js 
Log Message:
Upgrade to FCKeditor ver 2.6.3

Index: common.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/browser/default/js/common.js,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** common.js	5 May 2008 00:35:25 -0000	1.5
--- common.js	10 Aug 2008 16:46:30 -0000	1.6
***************
*** 36,40 ****
  			break ;
  		}
! 		catch( e ) {}
  
  		// Remove a domain part: www.mytest.example.com => mytest.example.com => example.com ...
--- 36,41 ----
  			break ;
  		}
! 		catch( e )
! 		{}
  
  		// Remove a domain part: www.mytest.example.com => mytest.example.com => example.com ...

Index: fckxml.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/browser/default/js/fckxml.js,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** fckxml.js	5 May 2008 00:35:25 -0000	1.4
--- fckxml.js	10 Aug 2008 16:46:30 -0000	1.5
***************
*** 62,66 ****
  			if ( oXmlHttp.readyState == 4 )
  			{
! 				if ( ( oXmlHttp.status != 200 && oXmlHttp.status != 304 ) || oXmlHttp.responseXML == null || oXmlHttp.responseXML.firstChild == null )
  				{
  					alert( 'The server didn\'t send back a proper XML response. Please contact your system administrator.\n\n' +
--- 62,84 ----
  			if ( oXmlHttp.readyState == 4 )
  			{
! 				var oXml ;
! 				try
! 				{
! 					// this is the same test for an FF2 bug as in fckxml_gecko.js
! 					// but we've moved the responseXML assignment into the try{}
! 					// so we don't even have to check the return status codes.
! 					var test = oXmlHttp.responseXML.firstChild ;
! 					oXml = oXmlHttp.responseXML ;
! 				}
! 				catch ( e )
! 				{
! 					try
! 					{
! 						oXml = (new DOMParser()).parseFromString( oXmlHttp.responseText, 'text/xml' ) ;
! 					}
! 					catch ( e ) {}
! 				}
! 
! 				if ( !oXml || !oXml.firstChild || oXml.firstChild.nodeName == 'parsererror' )
  				{
  					alert( 'The server didn\'t send back a proper XML response. Please contact your system administrator.\n\n' +
***************
*** 71,75 ****
  				}
  
! 				oFCKXml.DOMDocument = oXmlHttp.responseXML ;
  				asyncFunctionPointer( oFCKXml ) ;
  			}
--- 89,93 ----
  				}
  
! 				oFCKXml.DOMDocument = oXml ;
  				asyncFunctionPointer( oFCKXml ) ;
  			}