This commit is contained in:
Eugene Pankov
2017-04-15 15:20:18 +02:00
parent f17df2bde5
commit c19f0b1895
28 changed files with 88 additions and 75 deletions

View File

@@ -1 +0,0 @@
export * from 'rxjs'

View File

@@ -55,8 +55,6 @@ export class AppRootComponent {
_themes: ThemesService,
_quitter: QuitterService,
) {
(<any>console).timeStamp('AppComponent ctor')
this.logger = log.create('main')
this.logger.info('v', electron.app.getVersion())

View File

@@ -1,4 +1,4 @@
.title((dblclick)='hostApp.toggleMaximize()') Term
.title((dblclick)='hostApp.toggleMaximize()') Terminus
button.btn.btn-secondary.btn-minimize((click)='hostApp.minimize()')
i.fa.fa-window-minimize
button.btn.btn-secondary.btn-maximize((click)='hostApp.toggleMaximize()')

View File

@@ -1,5 +1,4 @@
import { NgModule, ModuleWithProviders } from '@angular/core'
console.info((<any>global).require.resolve('@angular/core'))
import { BrowserModule } from '@angular/platform-browser'
import { BrowserAnimationsModule } from '@angular/platform-browser/animations'
import { FormsModule } from '@angular/forms'
@@ -64,9 +63,6 @@ const PROVIDERS = [
],
})
export default class AppModule {
}
export class AppRootModule {
static forRoot(): ModuleWithProviders {
return {
ngModule: AppModule,
@@ -75,5 +71,5 @@ export class AppRootModule {
}
}
export { AppRootComponent }
export { AppRootComponent as bootstrap }
export * from './api'

View File

@@ -53,7 +53,7 @@ const configMerge = (a, b) => require('deepmerge')(a, b, { arrayMerge: (_d, s) =
@Injectable()
export class ConfigService {
store: ConfigProxy
store: any
change = new EventEmitter()
restartRequested: boolean
private _store: any

View File

@@ -1,6 +1,5 @@
import { Injectable } from '@angular/core'
@Injectable()
export class ElectronService {
constructor() {

View File

@@ -28,7 +28,7 @@ export class HostAppService {
electron.ipcRenderer.on('host:quit-request', () => this.zone.run(() => this.quitRequested.emit()))
electron.ipcRenderer.on('uncaughtException', function(err) {
console.error('Unhandled exception:', err)
this.logger.error('Unhandled exception:', err)
})
electron.ipcRenderer.on('host:window-shown', () => {

View File

@@ -22,6 +22,7 @@ module.exports = {
test: /\.ts$/,
loader: 'awesome-typescript-loader',
options: {
configFileName: path.resolve(__dirname, 'tsconfig.json'),
paths: {
"terminus-*": [path.resolve(__dirname, '../terminus-*')],
"*": [path.resolve(__dirname, '../app/node_modules/*')],

View File

@@ -1 +0,0 @@
export * from 'zone.js'