File tree Expand file tree Collapse file tree 2 files changed +12
-6
lines changed Expand file tree Collapse file tree 2 files changed +12
-6
lines changed Original file line number Diff line number Diff line change @@ -168,12 +168,17 @@ function getTemplate(options) {
168
168
}
169
169
170
170
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 ;
174
181
}
175
-
176
- return lastMixin . renderServer || lastMixin . template ;
177
182
}
178
183
179
184
return undefined ;
Original file line number Diff line number Diff line change @@ -30,7 +30,8 @@ var contentComponent = {
30
30
} ,
31
31
{
32
32
template : '<div>3333333</div>'
33
- }
33
+ } ,
34
+ { }
34
35
]
35
36
}
36
37
}
You can’t perform that action at this time.
0 commit comments