From 049f08b8f9468b12afff4b0658fb81b04d8fef02 Mon Sep 17 00:00:00 2001 From: Eugene Pankov Date: Sat, 24 Mar 2018 23:45:40 +0100 Subject: [PATCH] namespacing fix --- terminus-core/src/components/baseTab.component.ts | 2 +- terminus-core/src/services/electron.service.ts | 3 ++- terminus-core/src/services/touchbar.service.ts | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/terminus-core/src/components/baseTab.component.ts b/terminus-core/src/components/baseTab.component.ts index 60a9a664..1708f631 100644 --- a/terminus-core/src/components/baseTab.component.ts +++ b/terminus-core/src/components/baseTab.component.ts @@ -25,7 +25,7 @@ export abstract class BaseTabComponent { } setTitle (title: string) { - this.title = title] + this.title = title if (!this.customTitle) { this.titleChange$.next(title) } diff --git a/terminus-core/src/services/electron.service.ts b/terminus-core/src/services/electron.service.ts index 0aafa404..33d0741f 100644 --- a/terminus-core/src/services/electron.service.ts +++ b/terminus-core/src/services/electron.service.ts @@ -1,4 +1,5 @@ import { Injectable } from '@angular/core' +import { TouchBar } from 'electron' @Injectable() export class ElectronService { @@ -10,7 +11,7 @@ export class ElectronService { globalShortcut: any screen: any remote: any - TouchBar: typeof Electron.TouchBar + TouchBar: typeof TouchBar private electron: any constructor () { diff --git a/terminus-core/src/services/touchbar.service.ts b/terminus-core/src/services/touchbar.service.ts index def333fa..e97c7faa 100644 --- a/terminus-core/src/services/touchbar.service.ts +++ b/terminus-core/src/services/touchbar.service.ts @@ -1,4 +1,5 @@ import { Injectable, Inject, NgZone } from '@angular/core' +import { TouchBarSegmentedControl, SegmentedControlSegment } from 'electron' import { Subject, Subscription } from 'rxjs' import { AppService } from './app.service' import { ConfigService } from './config.service' @@ -10,8 +11,8 @@ import { IToolbarButton, ToolbarButtonProvider } from '../api' export class TouchbarService { tabSelected$ = new Subject() private titleSubscriptions = new Map() - private tabsSegmentedControl: Electron.TouchBarSegmentedControl - private tabSegments: Electron.SegmentedControlSegment[] = [] + private tabsSegmentedControl: TouchBarSegmentedControl + private tabSegments: SegmentedControlSegment[] = [] constructor ( private app: AppService,