Merge pull request #199 from cjolif/master

Fix a possible build issue
dmachi · May 13, 2013 · 24d98e1 · 24d98e1
2 parents 2bfafa3 + 95dd658
commit 24d98e1
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/build/discoverAppConfig.js b/build/discoverAppConfig.js
@@ -55,7 +55,7 @@ define([
 			console.log(e);
 		}
 		if(config){
-			var mids = [];
+			var mids = [], params = {};
 			if(config.loaderConfig){
 				require(config.loaderConfig);
 			}
@@ -86,17 +86,17 @@ define([
 				mids.push("dojox/css3/transit");
 			}
 			if(config.template){
+				params.text = true;
+				bc.layers[mainLayer].include.push("dojo/text");
 				mids.push(config.template);
 			}
 			if(config.controller && config.controller != "none"){
 				mids.push(config.controller.replace(/(\.js)$/, ""));
 			}
 			if(config.nls){
 				// we use nls let's add dojo/i18n to the main layer as it will be shared by a lot of views
-				if(!params.nls){
-					params.nls = true;
-					bc.layers[mainLayer].include.push("dojo/i18n");
-				}
+				params.nls = true;
+				bc.layers[mainLayer].include.push("dojo/i18n");
 				mids.push(config.nls);
 			}
 			if(config.view){
@@ -108,7 +108,7 @@ define([
 			}
 			// go into the view children
 			if(config.views){
-				parseViews(mids, mainLayer, config.views, {});
+				parseViews(mids, mainLayer, config.views, params);
 			}
 			Array.prototype.splice.apply(bc.layers[mainLayer].include, [bc.layers[mainLayer].length, 0].concat(mids));
 		}else{