Skip to content

Commit 2922f82

Browse files
committed
really fix the bug with dojo
1 parent 6f4594c commit 2922f82

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

i18n.js

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,16 +152,21 @@ define(['./i18n/common', "module"], function (common, module) {
152152
}
153153
};
154154

155+
/* jshint -W074 */
155156
return {
156157
load: function (name, req, onLoad, config) {
157158
config = config || {};
158159

159-
var moduleConfig = module.config() || {},
160+
var moduleConfig = {},
160161
masterMid,
161162
layer;
162163

164+
// Copy the config
165+
mixin(moduleConfig, typeof module.config === "function" ? module.config() || {} : {});
166+
167+
163168
moduleConfig.enhanceLayer = moduleConfig.enhanceLayer === undefined ? true : moduleConfig.enhanceLayer;
164-
169+
165170
// Parse name and set the locale if a top level bundle is required
166171
name = parseName(name);
167172
name.requestedLocale = name.requestedLocale || common.getLocale(moduleConfig.locale || config.locale);
@@ -198,5 +203,8 @@ define(['./i18n/common', "module"], function (common, module) {
198203
return;
199204
}
200205
}
206+
207+
201208
};
209+
/* jshint +W074 */
202210
});

0 commit comments

Comments
 (0)