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 bb...@apache.org on 2006/11/12 17:23:33 UTC

svn commit: r473995 - /incubator/xap/trunk/src/xap/application/Application.js

Author: bbuffone
Date: Sun Nov 12 09:23:31 2006
New Revision: 473995

URL: http://svn.apache.org/viewvc?view=rev&rev=473995
Log:
issue with the context not being picked up correctly.

Modified:
    incubator/xap/trunk/src/xap/application/Application.js

Modified: incubator/xap/trunk/src/xap/application/Application.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/application/Application.js?view=diff&rev=473995&r1=473994&r2=473995
==============================================================================
--- incubator/xap/trunk/src/xap/application/Application.js (original)
+++ incubator/xap/trunk/src/xap/application/Application.js Sun Nov 12 09:23:31 2006
@@ -55,12 +55,6 @@
 xap.application.Application = function(applicationConfig) {
 	if (applicationConfig != null){
     	this._applicationConfig = applicationConfig;
-		// Make sure there's a context:    	
-	    if (this._applicationConfig.context == null){
-	    	this._applicationConfig.context = "../../";
-	    }    	  
-    }else{
-    	this._applicationConfig = {context: "../../"};  
     }
 }
 
@@ -137,7 +131,11 @@
  */
 xap.application.Application.prototype._processConfiguration = function() {
 	if (this._applicationConfig.configFilePath == null){
-		this._applicationConfig.configFilePath = this._applicationConfig.context + "XapConfig.js";
+		if (this._applicationConfig.context != null){
+			this._applicationConfig.configFilePath = this._applicationConfig.context + "XapConfig.js";
+		}else{
+			this._applicationConfig.configFilePath = "XapConfig.js";
+		}
 	}
 
 	//TODO may we can remove the need for this.