Update angular2 to rc.5 and its router to rc.1.

Closes #70.
This commit is contained in:
József Farkas
2016-08-10 18:29:59 +02:00
parent 23b5dab284
commit baf55077ce
5 changed files with 48 additions and 21 deletions

26
src/app.module.ts Normal file
View File

@@ -0,0 +1,26 @@
import { NgModule } from '@angular/core';
import { BrowserModule } from '@angular/platform-browser';
import { LocationStrategy, HashLocationStrategy } from '@angular/common';
import { APP_ROUTER_PROVIDERS } from './main-app.routes';
import { DataProviderService } from './services/data-provider.service';
import { MapperService } from './services/mapper.service';
import { MainAppComponent } from './main-app.component';
import { KeymapComponent } from './components/keymap/keymap.component';
import { MacroComponent } from './components/macro/macro.component';
import { LegacyLoaderComponent } from './components/legacy/legacy-loader.component';
@NgModule({
declarations: [MainAppComponent, KeymapComponent, MacroComponent, LegacyLoaderComponent],
imports: [BrowserModule],
providers: [
DataProviderService,
MapperService,
APP_ROUTER_PROVIDERS,
{ provide: LocationStrategy, useClass: HashLocationStrategy }
],
bootstrap: [MainAppComponent]
})
export class AppModule { }

View File

@@ -1,17 +1,6 @@
import { bootstrap } from '@angular/platform-browser-dynamic';
import { MainAppComponent } from './main-app.component';
import { DataProviderService } from './services/data-provider.service';
import { MapperService } from './services/mapper.service';
import { APP_ROUTER_PROVIDERS } from './main-app.routes';
import { LocationStrategy, HashLocationStrategy } from '@angular/common';
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
import { AppModule } from './app.module';
process.stdout = require('browser-stdout')();
bootstrap(MainAppComponent, [
DataProviderService,
MapperService,
APP_ROUTER_PROVIDERS,
{ provide: LocationStrategy, useClass: HashLocationStrategy }
]).catch(err => console.error(err));
platformBrowserDynamic().bootstrapModule(AppModule);

View File

@@ -47,7 +47,7 @@
<mouse-tab #tab *ngSwitchCase="TabName.Mouse" class="popover-content" [defaultKeyAction]="defaultKeyAction"></mouse-tab>
<macro-tab #tab *ngSwitchCase="TabName.Macro" class="popover-content" [defaultKeyAction]="defaultKeyAction"></macro-tab>
<keymap-tab #tab *ngSwitchCase="TabName.Keymap" class="popover-content" [defaultKeyAction]="defaultKeyAction"></keymap-tab>
<none-tab #tab *ngSwitchCase="TabName.None" class="popover-content" [defaultKeyAction]="defaultKeyAction"></none-tab>
<none-tab #tab *ngSwitchCase="TabName.None" class="popover-content"></none-tab>
</div>
<div class="row">
<div class="popover-action">