Merge 1bb4bfe1f5
into 2e3b37a4f8
This commit is contained in:
commit
421ab5fe21
|
@ -86,7 +86,7 @@ module.exports = function compile(options) {
|
||||||
var modelInstructions = buildAllModelInstructions(
|
var modelInstructions = buildAllModelInstructions(
|
||||||
modelsRootDir, modelsConfig, modelSources, options.modelDefinitions);
|
modelsRootDir, modelsConfig, modelSources, options.modelDefinitions);
|
||||||
|
|
||||||
var mixinDirs = options.mixinDirs || [];
|
var mixinDirs = options.mixinDirs || modelsMeta.mixinDirs || [];
|
||||||
var mixinSources = options.mixinSources || modelsMeta.mixins || ['./mixins'];
|
var mixinSources = options.mixinSources || modelsMeta.mixins || ['./mixins'];
|
||||||
var mixinInstructions = buildAllMixinInstructions(
|
var mixinInstructions = buildAllMixinInstructions(
|
||||||
appRootDir, mixinDirs, mixinSources, options, modelInstructions);
|
appRootDir, mixinDirs, mixinSources, options, modelInstructions);
|
||||||
|
|
Loading…
Reference in New Issue