refactor: improve breadcrumbs

burntblark · Apr 21, 2018 · b891114 · b891114
1 parent e056c70
commit b891114
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/dist/breadcrumb/app-breadcrumb.component.js b/dist/breadcrumb/app-breadcrumb.component.js
diff --git a/dist/breadcrumb/app-breadcrumb.component.js.map b/dist/breadcrumb/app-breadcrumb.component.js.map
diff --git a/dist/breadcrumb/app-breadcrumb.component.metadata.json b/dist/breadcrumb/app-breadcrumb.component.metadata.json
@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"AppBreadcrumbComponent":{"__symbolic":"class","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Component","line":4,"character":1},"arguments":[{"selector":"app-breadcrumb","template":"\n    <ng-template ngFor let-breadcrumb [ngForOf]=\"breadcrumbs | async\" let-last = last>\n      <li class=\"breadcrumb-item\"\n          *ngIf=\"breadcrumb.label.title&&breadcrumb.url.substring(breadcrumb.url.length-1) == '/'||breadcrumb.label.title&&last\"\n          [ngClass]=\"{active: last}\">\n        <a *ngIf=\"!last\" [routerLink]=\"breadcrumb.url\">{{breadcrumb.label.title}}</a>\n        <span *ngIf=\"last\" [routerLink]=\"breadcrumb.url\">{{breadcrumb.label.title}}</span>\n      </li>\n    </ng-template>\n  "}]}],"members":{"fixed":[{"__symbolic":"property","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Input","line":18,"character":3}}]}],"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"./app-breadcrumb.service","name":"AppBreadcrumbService","line":21,"character":30},{"__symbolic":"reference","module":"@angular/core","name":"ElementRef","line":21,"character":63}]}],"ngOnInit":[{"__symbolic":"method"}],"isFixed":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"AppBreadcrumbComponent":{"__symbolic":"class","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Component","line":4,"character":1},"arguments":[{"selector":"app-breadcrumb","template":"\n    <ng-template ngFor let-breadcrumb [ngForOf]=\"breadcrumbs | async\" let-last = last>\n      <li class=\"breadcrumb-item\"\n          *ngIf=\"breadcrumb.label.title && (breadcrumb.url.slice(-1) == '/' || last)\"\n          [ngClass]=\"{active: last}\">\n        <a *ngIf=\"!last\" [routerLink]=\"breadcrumb.url\">{{breadcrumb.label.title}}</a>\n        <span *ngIf=\"last\" [routerLink]=\"breadcrumb.url\">{{breadcrumb.label.title}}</span>\n      </li>\n    </ng-template>\n  "}]}],"members":{"fixed":[{"__symbolic":"property","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Input","line":18,"character":3}}]}],"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"./app-breadcrumb.service","name":"AppBreadcrumbService","line":21,"character":30},{"__symbolic":"reference","module":"@angular/core","name":"ElementRef","line":21,"character":63}]}],"ngOnInit":[{"__symbolic":"method"}],"isFixed":[{"__symbolic":"method"}]}}}}]
diff --git a/dist/breadcrumb/app-breadcrumb.module.ngfactory.js.map b/dist/breadcrumb/app-breadcrumb.module.ngfactory.js.map
diff --git a/src/breadcrumb/app-breadcrumb.component.ts b/src/breadcrumb/app-breadcrumb.component.ts
@@ -7,7 +7,7 @@ import { AppBreadcrumbService } from './app-breadcrumb.service';
   template: `
     <ng-template ngFor let-breadcrumb [ngForOf]="breadcrumbs | async" let-last = last>
       <li class="breadcrumb-item"
-          *ngIf="breadcrumb.label.title&&breadcrumb.url.substring(breadcrumb.url.length-1) == '/'||breadcrumb.label.title&&last"
+          *ngIf="breadcrumb.label.title && (breadcrumb.url.slice(-1) == '/' || last)"
           [ngClass]="{active: last}">
         <a *ngIf="!last" [routerLink]="breadcrumb.url">{{breadcrumb.label.title}}</a>
         <span *ngIf="last" [routerLink]="breadcrumb.url">{{breadcrumb.label.title}}</span>