From ba8c46e3e184f3b3244c105552fb83e5d6cb7efe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gary=20Gro=C3=9Fgarten?= Date: Sun, 9 Dec 2018 03:06:40 +0100 Subject: [PATCH] fix(app-bar): fix routing, now using NavController --- projects/core/package.json | 2 +- .../app-bar-tab-content.component.html | 3 +-- .../app-bar-tab-content/app-bar-tab-content.component.ts | 9 +++++++-- projects/core/src/lib/app-bar/app-bar.component.ts | 3 ++- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/projects/core/package.json b/projects/core/package.json index a98c93a2..7a7829b4 100644 --- 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 index a65e6a5e..5f4bca93 100644 --- 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 @@ - - + \ No newline at end of file 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 index e92eea86..55ff978a 100644 --- 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 index eece9c23..05957cc6 100644 --- 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() { }