Index: /FCKeditor/branches/developers/alfonsoml/_test/automated/tests/fckdomrange.html
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/_test/automated/tests/fckdomrange.html	(revision 63)
+++ /FCKeditor/branches/developers/alfonsoml/_test/automated/tests/fckdomrange.html	(revision 64)
@@ -8,4 +8,5 @@
 	<script type="text/javascript">
 
+FCKScriptLoader._FCKeditorPath = document.location.pathname.substring(0,document.location.pathname.lastIndexOf('_test')) ;
 FCKScriptLoader.Load( 'FCKDomRange' ) ;
 
Index: /FCKeditor/branches/developers/alfonsoml/_test/manual/fckdomrange/test1.html
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/_test/manual/fckdomrange/test1.html	(revision 63)
+++ /FCKeditor/branches/developers/alfonsoml/_test/manual/fckdomrange/test1.html	(revision 64)
@@ -8,4 +8,5 @@
 var FCK = new Object() ;
 
+FCKScriptLoader._FCKeditorPath = document.location.pathname.substring(0,document.location.pathname.lastIndexOf('_test')) ;
 FCKScriptLoader.Load( 'FCKDomRange' ) ;
 FCKScriptLoader.Load( 'FCKDebug' ) ;
Index: /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fckpanel.js
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fckpanel.js	(revision 63)
+++ /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fckpanel.js	(revision 64)
@@ -236,5 +236,5 @@
 FCKPanel.prototype.CreateChildPanel = function()
 {
-	var oWindow = this._Popup ? FCKTools.GetParentWindow( this.Document ) : this._Window ;
+	var oWindow = this._Popup ? FCKTools.GetDocumentWindow( this.Document ) : this._Window ;
 
 	var oChildPanel = new FCKPanel( oWindow, true ) ;
Index: /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fcktoolbarspecialcombo.js
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fcktoolbarspecialcombo.js	(revision 63)
+++ /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fcktoolbarspecialcombo.js	(revision 64)
@@ -17,5 +17,5 @@
 	this.SourceView			= false ;
 	this.ContextSensitive	= true ;
-	this._LastValue = null ;
+	this._LastValue			= null ;
 }
 
Index: /FCKeditor/branches/developers/alfonsoml/editor/_source/internals/fckselection_ie.js
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/_source/internals/fckselection_ie.js	(revision 63)
+++ /FCKeditor/branches/developers/alfonsoml/editor/_source/internals/fckselection_ie.js	(revision 64)
@@ -99,5 +99,5 @@
 	var oNode ;
 
-	if ( !FCK.EditorDocument )
+	if ( ! FCK.EditorDocument )
 		return null ;
 
Index: /FCKeditor/branches/developers/alfonsoml/editor/_source/internals/fcktools.js
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/_source/internals/fcktools.js	(revision 63)
+++ /FCKeditor/branches/developers/alfonsoml/editor/_source/internals/fcktools.js	(revision 64)
@@ -66,9 +66,4 @@
 	for ( var i = 0 ; i < targetWindow.frames.length ; i++ )
 		FCKTools.FixDocumentParentWindow( targetWindow.frames[i] ) ;
-}
-
-FCKTools.GetParentWindow = function( document )
-{
-	return document.contentWindow || document.parentWindow ;
 }
 
Index: /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_link/fck_link.js
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_link/fck_link.js	(revision 63)
+++ /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_link/fck_link.js	(revision 64)
@@ -54,7 +54,4 @@
 oRegex.ReserveTarget = new RegExp('') ;
 oRegex.ReserveTarget.compile( '^_(blank|self|top|parent)$', 'i' ) ;
-
-oRegex.PopupUri = new RegExp('') ;
-oRegex.PopupUri.compile( "^javascript:void\\(\\s*window.open\\(\\s*'([^']+)'\\s*,\\s*(?:'([^']*)'|null)\\s*,\\s*'([^']*)'\\s*\\)\\s*\\)\\s*$" ) ;
 
 oRegex.PopupUri = new RegExp('') ;
@@ -415,27 +412,5 @@
 	return ( "window.open(this.href," + sWindowName + ",'" + sFeatures + "'); return false" ) ;
 }
-/*
-//#### Builds the javascript URI to open a popup to the specified URI.
-function BuildPopupUri( uri )
-{
-	var oReg = new RegExp( "'", "g" ) ;
-	var sWindowName = "'" + GetE('txtPopupName').value.replace(oReg, "\\'") + "'" ;
-
-	var sFeatures = '' ;
-	var aChkFeatures = document.getElementsByName('chkFeature') ;
-	for ( var i = 0 ; i < aChkFeatures.length ; i++ )
-	{
-		if ( i > 0 ) sFeatures += ',' ;
-		sFeatures += aChkFeatures[i].value + '=' + ( aChkFeatures[i].checked ? 'yes' : 'no' ) ;
-	}
-
-	if ( GetE('txtPopupWidth').value.length > 0 )	sFeatures += ',width=' + GetE('txtPopupWidth').value ;
-	if ( GetE('txtPopupHeight').value.length > 0 )	sFeatures += ',height=' + GetE('txtPopupHeight').value ;
-	if ( GetE('txtPopupLeft').value.length > 0 )	sFeatures += ',left=' + GetE('txtPopupLeft').value ;
-	if ( GetE('txtPopupTop').value.length > 0 )		sFeatures += ',top=' + GetE('txtPopupTop').value ;
-
-	return ( "javascript:void(window.open('" + uri + "'," + sWindowName + ",'" + sFeatures + "'))" ) ;
-}
-*/
+
 //#### Fills all Popup related fields.
 function FillPopupFields( windowName, features )
@@ -488,17 +463,4 @@
 			sUri = GetE('cmbLinkProtocol').value + sUri ;
 
-/* Disabled due to the new accesible popups
-			if( GetE('cmbTarget').value == 'popup' )
-			{
-				// Check the window name, according to http://www.w3.org/TR/html4/types.html#type-frame-target (IE throw erros with spaces).
-				if ( /(^[^a-zA-Z])|(\s)/.test( GetE('txtPopupName').value ) )
-				{
-					alert( FCKLang.DlnLnkMsgInvPopName ) ;
-					return false ;
-				}
-				
-				sUri = BuildPopupUri( sUri ) ;
-			}
-*/
 			break ;
 
Index: /FCKeditor/branches/developers/alfonsoml/editor/filemanager/browser/default/js/fckxml.js
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/filemanager/browser/default/js/fckxml.js	(revision 63)
+++ /FCKeditor/branches/developers/alfonsoml/editor/filemanager/browser/default/js/fckxml.js	(revision 64)
@@ -45,5 +45,5 @@
 			if ( oXmlHttp.readyState == 4 )
 			{
-				if ( oXmlHttp.responseXML == null )
+				if ( oXmlHttp.responseXML == null || oXmlHttp.responseXML.firstChild == null)
 				{
 					alert( 'The server didn\'t send back a proper XML response.\r\n\r\n' +
Index: /FCKeditor/branches/developers/alfonsoml/fckconfig.js
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/fckconfig.js	(revision 63)
+++ /FCKeditor/branches/developers/alfonsoml/fckconfig.js	(revision 64)