Update to angular2-rc.6

This commit is contained in:
Farkas József
2016-09-01 17:44:51 +02:00
parent 5367346990
commit a1020982b8
20 changed files with 90 additions and 106 deletions

View File

@@ -1,16 +1,9 @@
import {Component, ViewEncapsulation} from '@angular/core';
import { ROUTER_DIRECTIVES } from '@angular/router';
import { SideMenuComponent } from '../components/side-menu';
@Component({
selector: 'main-app',
template: require('./main-app.component.html'),
styles: [require('./main-app.component.scss')],
directives: [SideMenuComponent, ROUTER_DIRECTIVES],
encapsulation: ViewEncapsulation.None
})
export class MainAppComponent {
constructor() {
}
}
export class MainAppComponent { }

View File

@@ -1,14 +1,15 @@
import { provideRouter, RouterConfig } from '@angular/router';
import { ModuleWithProviders } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
import { keymapRoutes } from '../components/keymap';
import { macroRoutes } from '../components/macro';
import { legacyRoutes } from '../components/legacy-loader';
export const routes: RouterConfig = [
const appRoutes: Routes = [
...keymapRoutes,
...macroRoutes,
...legacyRoutes
];
export const APP_ROUTER_PROVIDERS = [
provideRouter(routes)
];
export const appRoutingProviders: any[] = [ ];
export const routing: ModuleWithProviders = RouterModule.forRoot(appRoutes, { useHash: true });