You are viewing a plain text version of this content. The canonical link for it is here.
Posted to xap-commits@incubator.apache.org by mt...@apache.org on 2007/06/15 17:12:50 UTC

svn commit: r547744 - in /incubator/xap/trunk/codebase/src/xap: Xap.js taghandling/PluginDocumentHandler.js

Author: mturyn
Date: Fri Jun 15 10:12:48 2007
New Revision: 547744

URL: http://svn.apache.org/viewvc?view=rev&rev=547744
Log:
Resolve some loading issues.

Modified:
    incubator/xap/trunk/codebase/src/xap/Xap.js
    incubator/xap/trunk/codebase/src/xap/taghandling/PluginDocumentHandler.js

Modified: incubator/xap/trunk/codebase/src/xap/Xap.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/codebase/src/xap/Xap.js?view=diff&rev=547744&r1=547743&r2=547744
==============================================================================
--- incubator/xap/trunk/codebase/src/xap/Xap.js (original)
+++ incubator/xap/trunk/codebase/src/xap/Xap.js Fri Jun 15 10:12:48 2007
@@ -64,6 +64,20 @@
  * @type xap.application.Application
  */
 Xap.createApplication = function(applicationConfig) {
+
+	// override dojo.hostenv.getBaseScriptUri() to return
+	// a blank string that allows our mapping [plugin name to path] to work
+	if(dojo.hostenv.getBaseScriptUri != Xap.dojo_hostenv_getBaseScriptUri) {
+		dojo.hostenv.getBaseScriptUri = Xap.dojo_hostenv_getBaseScriptUri;
+	}
+	
+	// We still want dojo.uri.dojoUri() function to work as before, so override that as well.
+	// The change above also affects dojo.uri.moduleUri() function, but that 
+	// function doees not seem to be used anywhere
+	if(dojo.uri.dojoUri != Xap.dojo_uri_dojoUri) {
+		dojo.uri.dojoUri = Xap.dojo_uri_dojoUri;
+	}	
+	
     Xap.require("xap.application.Application");
 	var application = new xap.application.Application(applicationConfig);	
 	

Modified: incubator/xap/trunk/codebase/src/xap/taghandling/PluginDocumentHandler.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/codebase/src/xap/taghandling/PluginDocumentHandler.js?view=diff&rev=547744&r1=547743&r2=547744
==============================================================================
--- incubator/xap/trunk/codebase/src/xap/taghandling/PluginDocumentHandler.js (original)
+++ incubator/xap/trunk/codebase/src/xap/taghandling/PluginDocumentHandler.js Fri Jun 15 10:12:48 2007
@@ -58,20 +58,6 @@
 	
 	//we had better be the first listener on the document!
 	doc.addStructureChangeListener( this );
-	
-	// override dojo.hostenv.getBaseScriptUri() to return
-	// a blank string that allows our mapping [plugin name to path] to work
-	if(dojo.hostenv.getBaseScriptUri != Xap.dojo_hostenv_getBaseScriptUri) {
-		dojo.hostenv.getBaseScriptUri = Xap.dojo_hostenv_getBaseScriptUri;
-	}
-	
-	// We still want dojo.uri.dojoUri() function to work as before, so override that as well.
-	// The change above also affects dojo.uri.moduleUri() function, but that 
-	// function doees not seem to be used anywhere
-	if(dojo.uri.dojoUri != Xap.dojo_uri_dojoUri) {
-		dojo.uri.dojoUri = Xap.dojo_uri_dojoUri;
-	}	
-	
 };
 
 /** @private */