From a93636332fbc159f3c0344992be539643bc9fb17 Mon Sep 17 00:00:00 2001 From: Adam Bradley Date: Fri, 10 Jun 2016 16:13:34 -0500 Subject: [PATCH] chore(router-deprecated): remove router-deprecated references --- scripts/karma/system.config.js | 4 ---- src/components/tabs/test/advanced/index.ts | 9 ++------- src/config/bootstrap.ts | 4 ---- 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/scripts/karma/system.config.js b/scripts/karma/system.config.js index 1201d9202f..3940943633 100644 --- a/scripts/karma/system.config.js +++ b/scripts/karma/system.config.js @@ -32,10 +32,6 @@ System.config({ main: 'index.js', defaultExtension: 'js' }, - '@angular/router-deprecated': { - main: 'index.js', - defaultExtension: 'js' - }, '@angular/http': { main: 'index.js', defaultExtension: 'js' diff --git a/src/components/tabs/test/advanced/index.ts b/src/components/tabs/test/advanced/index.ts index aa849be5c9..d65d73f992 100644 --- a/src/components/tabs/test/advanced/index.ts +++ b/src/components/tabs/test/advanced/index.ts @@ -1,8 +1,7 @@ import {Component, ViewChild} from '@angular/core'; -import {Routes} from '@angular/router'; import {Location} from '@angular/common'; -import {ionicBootstrap, NavController, NavParams, Modal, ViewController, Tabs} from '../../../../../src'; +import {ionicBootstrap, NavController, NavParams, Modal, ViewController, Tabs, Tab} from '../../../../../src'; @Component({ @@ -73,7 +72,7 @@ class TabsPage { constructor(private nav: NavController, private params: NavParams) {} ngAfterViewInit() { - this.tabs.ionChange.subscribe(tab => { + this.tabs.ionChange.subscribe((tab: Tab) => { console.log('tabs.ionChange.subscribe', tab.index); }); } @@ -414,10 +413,6 @@ class Tab3Page1 { @Component({ template: '' }) -// @Routes([ -// { path: '/', component: SignIn }, -// { path: '/tabs', component: TabsPage }, -// ]) class E2EApp { root = SignIn; } diff --git a/src/config/bootstrap.ts b/src/config/bootstrap.ts index 9d050b183f..467f0755f2 100644 --- a/src/config/bootstrap.ts +++ b/src/config/bootstrap.ts @@ -1,7 +1,5 @@ import {bootstrap} from '@angular/platform-browser-dynamic'; import {enableProdMode, provide, PLATFORM_DIRECTIVES, ComponentRef, NgZone} from '@angular/core'; -import {ROUTER_PROVIDERS} from '@angular/router'; -import {LocationStrategy, HashLocationStrategy} from '@angular/common'; import {HTTP_PROVIDERS} from '@angular/http'; import {App} from '../components/app/app'; @@ -131,8 +129,6 @@ export function ionicProviders(customProviders?: Array, config?: any): any[ Translate, TapClick, provide(PLATFORM_DIRECTIVES, {useValue: [directives], multi: true}), - ROUTER_PROVIDERS, - provide(LocationStrategy, {useClass: HashLocationStrategy}), HTTP_PROVIDERS, customProviders ];