fix(app-bar): fix routing, now using NavController

fivethree-team · Dec 9, 2018 · ba8c46e · ba8c46e
1 parent 83ef702
commit ba8c46e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/projects/core/package.json b/projects/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@fivethree/core",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Fivethree Core Components",
   "keywords": [
     "fivethree",

diff --git a/projects/core/src/lib/app-bar-tab-content/app-bar-tab-content.component.html b/projects/core/src/lib/app-bar-tab-content/app-bar-tab-content.component.html
@@ -1,4 +1,3 @@
-<fiv-ripple (fivClick)="link.click()" class="tab" [ngClass]="{'active': active}">
-  <a [href]="href" #link></a>
+<fiv-ripple (fivClick)="onClick()" class="tab" [ngClass]="{'active': active}">
   <fiv-icon [fivCenter] [name]="icon"></fiv-icon>
 </fiv-ripple>
diff --git a/projects/core/src/lib/app-bar-tab-content/app-bar-tab-content.component.ts b/projects/core/src/lib/app-bar-tab-content/app-bar-tab-content.component.ts
@@ -1,4 +1,5 @@
-import { Component, OnInit, Input} from '@angular/core';
+import { Component, OnInit, Input } from '@angular/core';
+import { NavController } from '@ionic/angular';
 
 @Component({
   selector: 'fiv-app-bar-tab-content',
@@ -12,8 +13,12 @@ export class AppBarTabContentComponent implements OnInit {
   @Input() active = false;
 
 
-  constructor() { }
+  constructor(private nav: NavController) { }
 
   ngOnInit() {
   }
+
+  onClick() {
+    this.nav.navigateRoot(this.href);
+  }
 }
diff --git a/projects/core/src/lib/app-bar/app-bar.component.ts b/projects/core/src/lib/app-bar/app-bar.component.ts
@@ -12,6 +12,7 @@ import {
 import { AppBarTabComponent } from '../app-bar-tab/app-bar-tab.component';
 import { Router } from '@angular/router';
 import { AppBarTabContentComponent } from '../app-bar-tab-content/app-bar-tab-content.component';
+import { NavController } from '@ionic/angular';
 
 @Component({
   selector: 'fiv-app-bar',
@@ -75,7 +76,7 @@ export class AppBarComponent implements OnInit, AfterViewInit {
 
 
 
-  constructor(private router: Router) { }
+  constructor() { }
 
   ngOnInit() {
   }