Skip to content

Commit 24d98e1

Browse files
committed
Merge pull request #199 from cjolif/master
Fix a possible build issue
2 parents 2bfafa3 + 95dd658 commit 24d98e1

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

build/discoverAppConfig.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ define([
5555
console.log(e);
5656
}
5757
if(config){
58-
var mids = [];
58+
var mids = [], params = {};
5959
if(config.loaderConfig){
6060
require(config.loaderConfig);
6161
}
@@ -86,17 +86,17 @@ define([
8686
mids.push("dojox/css3/transit");
8787
}
8888
if(config.template){
89+
params.text = true;
90+
bc.layers[mainLayer].include.push("dojo/text");
8991
mids.push(config.template);
9092
}
9193
if(config.controller && config.controller != "none"){
9294
mids.push(config.controller.replace(/(\.js)$/, ""));
9395
}
9496
if(config.nls){
9597
// we use nls let's add dojo/i18n to the main layer as it will be shared by a lot of views
96-
if(!params.nls){
97-
params.nls = true;
98-
bc.layers[mainLayer].include.push("dojo/i18n");
99-
}
98+
params.nls = true;
99+
bc.layers[mainLayer].include.push("dojo/i18n");
100100
mids.push(config.nls);
101101
}
102102
if(config.view){
@@ -108,7 +108,7 @@ define([
108108
}
109109
// go into the view children
110110
if(config.views){
111-
parseViews(mids, mainLayer, config.views, {});
111+
parseViews(mids, mainLayer, config.views, params);
112112
}
113113
Array.prototype.splice.apply(bc.layers[mainLayer].include, [bc.layers[mainLayer].length, 0].concat(mids));
114114
}else{

0 commit comments

Comments
 (0)