Skip to content
This repository has been archived by the owner on Nov 9, 2021. It is now read-only.

engine support #146

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
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
21 changes: 16 additions & 5 deletions addon/components/bread-crumbs.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ export default Component.extend({
classNameBindings: ['breadCrumbClass'],
hasBlock: bool('template').readOnly(),
routing: service('-routing'),
currentUrl: readOnly('applicationRoute.router.url'),
currentRouteName: readOnly('applicationRoute.controller.currentRouteName'),
currentUrl: readOnly('routing.router.currentURL'),
currentRouteName: readOnly('routing.router.currentRouteName'),

routeHierarchy: computed('currentUrl', 'currentRouteName', 'reverse', {
get() {
Expand Down Expand Up @@ -68,11 +68,22 @@ export default Component.extend({

if (routes.length === 1) {
let path = `${name}.index`;

return (this._lookupRoute(path)) ? path : name;
let pathName = this._lookupRoute(path) ? path : name;
return this._trimEngineMountName(pathName);
}

return routes.join('.');
return this._trimEngineMountName(routes.join('.'));
},

_trimEngineMountName(pathName) {
let owner = getOwner(this);
let { mountPoint } = owner;
if(mountPoint) {
return pathName.split('.')
.splice(1)
.join('.');
}
return pathName;
},

_filterIndexAndLoadingRoutes(routeNames) {
Expand Down
9 changes: 0 additions & 9 deletions addon/initializers/crumbly.js

This file was deleted.

1 change: 0 additions & 1 deletion app/initializers/crumbly.js

This file was deleted.