Skip to content

Commit

Permalink
Removed template from routable component condition
Browse files Browse the repository at this point in the history
(Fixes emberjs#12154)

If there's a template the same name as the route, that template is used instead of a routable component even if a component name is passed in the options hash to `route.render`.
  • Loading branch information
mdehoog committed Sep 1, 2015
1 parent bc84326 commit d0c8ed8
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion packages/ember-routing/lib/system/route.js
Original file line number Diff line number Diff line change
Expand Up @@ -2150,7 +2150,7 @@ function buildRenderOptions(route, namePassed, isDefaultRender, name, options) {
let componentLookup = route.container.lookup('component-lookup:main');
Component = componentLookup.lookupFactory(componentName);
let isGlimmerComponent = Component && Component.proto().isGlimmerComponent;
if (!template && !ViewClass && Component && isGlimmerComponent) {
if (!ViewClass && Component && isGlimmerComponent) {
renderOptions.Component = Component;
renderOptions.ViewClass = undefined;
renderOptions.attrs = { model: get(controller, 'model') };
Expand Down

0 comments on commit d0c8ed8

Please sign in to comment.