incubator-xap-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmarga...@apache.org
Subject svn commit: r434221 - /incubator/xap/trunk/src/xap/Xap.js
Date Wed, 23 Aug 2006 22:29:38 GMT
Author: jmargaris
Date: Wed Aug 23 15:29:37 2006
New Revision: 434221

URL: http://svn.apache.org/viewvc?rev=434221&view=rev
Log:
removes loadZimbra and added baseUri setting for dojo
paths

Modified:
    incubator/xap/trunk/src/xap/Xap.js

Modified: incubator/xap/trunk/src/xap/Xap.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/Xap.js?rev=434221&r1=434220&r2=434221&view=diff
==============================================================================
--- incubator/xap/trunk/src/xap/Xap.js (original)
+++ incubator/xap/trunk/src/xap/Xap.js Wed Aug 23 15:29:37 2006
@@ -22,6 +22,16 @@
 dojo.hostenv.setModulePrefix("xap", "../xap");
 dojo.hostenv.setModulePrefix("google", "../google");
 
+//if the user does not have a base relative path set
+//then set it to a good default that works with our build scripts
+//and deployment structure
+if (!djConfig){
+	djConfig = { baseRelativePath : "../../src/dojo/src"};
+}
+else if (!djConfig.baseRelativePath){
+	djConfig.baseRelativePath = "../../src/dojo/src";
+}
+
 
 Xap.kwCompoundRequire = function(){
 	dojo.kwCompoundRequire.apply(dojo, arguments);
@@ -300,7 +310,6 @@
 
 	Xap._sourceRootDir = sourceRootDir;
 	Xap.loadXap( sourceRootDir );
-	Xap.loadZimbra( sourceRootDir );
 	
 // We've done all the "real" loading, now let's attach code to source files 
 // previously targetted for debugger-friendly (specified before we bootstrap):
@@ -326,139 +335,6 @@
 }
 
 
-//for some reason dojo.hostent.loadUri() doesn't work on some (one?)
-//of these files, it gives an error on this.func being undefined.
-//That's ok as we are going to ditch these files anyway
-Xap.loadZimbra = function( sourceRootDir ) {
-
-	if ( !sourceRootDir.match(Xap.trailingSlashRegexp)){
-		sourceRootDir +="/" ;
-	}
-
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/msgs/AjxMsg.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/core/AjxCore.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/core/AjxEnv.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/util/AjxUtil.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/util/AjxText.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/core/AjxException.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/util/AjxCookie.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/soap/AjxSoapException.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/soap/AjxSoapFault.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/soap/AjxSoapDoc.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/net/AjxRpcRequest.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/net/AjxRpc.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/util/AjxWindowOpener.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/util/AjxVector.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/util/AjxStringUtils.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/debug/AjxDebug.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/debug/AjxDebugXmlDocument.js"
);
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/xml/AjxXmlDoc.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/config/data/AjxConfig.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/core/AjxEnv.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/core/AjxImg.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/core/AjxException.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/util/AjxCallback.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/util/AjxTimedAction.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/events/AjxEvent.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/events/AjxEventMgr.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/events/AjxListener.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/util/AjxDateUtils.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/util/AjxStringUtils.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/util/AjxVector.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/util/AjxSelectionManager.js"
);
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/net/AjxPost.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/util/AjxBuffer.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/util/AjxCache.js" );
-	
-	// DWT classes
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/core/DwtImg.js" );
-	
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/core/Dwt.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/core/DwtException.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/core/DwtDraggable.js" );
-	
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/graphics/DwtCssStyle.js"
);
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/graphics/DwtPoint.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/graphics/DwtRectangle.js"
);
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/graphics/DwtUnits.js" );
-	
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/events/DwtEvent.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/events/DwtEventManager.js"
);
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/events/DwtDateRangeEvent.js"
);
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/events/DwtDisposeEvent.js"
);
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/events/DwtUiEvent.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/events/DwtControlEvent.js"
);
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/events/DwtKeyEvent.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/events/DwtMouseEvent.js"
);
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/events/DwtMouseEventCapture.js"
);
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/events/DwtListViewActionEvent.js"
);
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/events/DwtSelectionEvent.js"
);
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/events/DwtHtmlEditorStateEvent.js"
);
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/events/DwtTreeEvent.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/events/DwtHoverEvent.js"
);
-	
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/dnd/DwtDragEvent.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/dnd/DwtDragSource.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/dnd/DwtDropEvent.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/dnd/DwtDropTarget.js" );
-	
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/widgets/DwtHoverMgr.js" );
-	
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/widgets/DwtControl.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/widgets/DwtComposite.js"
);
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/widgets/DwtShell.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/widgets/DwtColorPicker.js"
);
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/widgets/DwtBaseDialog.js"
);
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/widgets/DwtDialog.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/widgets/DwtLabel.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/widgets/DwtListView.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/widgets/DwtButton.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/widgets/DwtMenuItem.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/widgets/DwtMenu.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/widgets/DwtMessageDialog.js"
);
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/widgets/DwtHtmlEditor.js"
);
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/widgets/DwtInputField.js"
);
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/widgets/DwtSash.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/widgets/DwtToolBar.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/graphics/DwtBorder.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/widgets/DwtToolTip.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/widgets/DwtStickyToolTip.js"
);
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/widgets/DwtTreeItem.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/widgets/DwtTree.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/widgets/DwtCalendar.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/widgets/DwtPropertyPage.js"
);
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/widgets/DwtTabView.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/widgets/DwtWizardDialog.js"
);
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/widgets/DwtSelect.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/widgets/DwtAddRemove.js"
);
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/widgets/DwtAlert.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/widgets/DwtText.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/widgets/DwtIframe.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/widgets/DwtXFormDialog.js"
);
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/widgets/DwtPropertySheet.js"
);
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/widgets/DwtGrouper.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/widgets/DwtProgressBar.js"
);
-	
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/events/DwtXFormsEvent.js"
);
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/xforms/XFormGlobal.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/xforms/XModel.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/xforms/XModelItem.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/xforms/XForm.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/xforms/XFormItem.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/xforms/XFormChoices.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/xforms/OSelect_XFormItem.js"
);
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/js/dwt/xforms/ButtonGrid.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/zimbra/examples/tree/TreeExample.js" );
-	
-	//TODO this really shouldn't be here, but they rely on some zimbra stuff
-	//and are zimbra extensions
-	xap.util.Utils.importFile(  sourceRootDir + "src/xap/components/zimbra/DwtSplitter.js" );
-	xap.util.Utils.importFile(  sourceRootDir + "src/xap/components/zimbra/DwtSplitChild.js"
);
-	xap.util.Utils.importFile(  sourceRootDir + "src/xap/components/zimbra/DwtTablePanel.js"
);
-	xap.util.Utils.importFile(  sourceRootDir + "src/xap/components/zimbra/DwtVerticalLayoutPanel.js"
);	
-	xap.util.Utils.importFile(  sourceRootDir + "src/xap/components/zimbra/DwtHorizontalLayoutPanel.js"
);	
-
-}
 
 Xap.resolveConstructor = function(aString){
 	var scoper = dj_global ;



Mime
View raw message