Skip to content

Commit 9767e1b

Browse files
author
Andrey Solodovnikov
committed
fixed the problem with fetching template from mixins (order problem)
1 parent 5b1ecb8 commit 9767e1b

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

src/renderer/asset.js

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -168,12 +168,17 @@ function getTemplate(options) {
168168
}
169169

170170
if (options.mixins) {
171-
var lastMixin = utils.last(options.mixins);
172-
if (!lastMixin) {
173-
return undefined;
171+
var mixinTemplatesArray = [];
172+
utils.every(options.mixins, function (item) {
173+
var itemTpl = item.renderServer || item.template;
174+
if (itemTpl) {
175+
mixinTemplatesArray.push(itemTpl);
176+
}
177+
})
178+
var lastTemplate = utils.last(mixinTemplatesArray);
179+
if (lastTemplate) {
180+
return lastTemplate;
174181
}
175-
176-
return lastMixin.renderServer || lastMixin.template;
177182
}
178183

179184
return undefined;

test/spec/mixins.spec/template.spec.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ var contentComponent = {
3030
},
3131
{
3232
template: '<div>3333333</div>'
33-
}
33+
},
34+
{}
3435
]
3536
}
3637
}

0 commit comments

Comments
 (0)