Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions addon/mixins/component-mixin.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@ export default Mixin.create({
layout
);

// Since https://github.com/emberjs/ember.js/pull/18096
if (typeof layout === 'function') layout = layout(getOwner(this));

// This is not public API and might break at any time...
let moduleName = (layout.meta || layout.referrer).moduleName.replace(/\.hbs$/, '');
if (/\/template$/.test(moduleName)) {
Expand Down