Fix client build

pull/1082/merge
Chocobozzz 2018-09-12 09:52:08 +02:00
parent c13e2bf340
commit bcb0c8958f
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
5 changed files with 13 additions and 33 deletions

View File

@ -5,8 +5,6 @@ import { ResetPasswordModule } from '@app/reset-password'
import { MetaLoader, MetaModule, MetaStaticLoader, PageTitlePositioning } from '@ngx-meta/core' import { MetaLoader, MetaModule, MetaStaticLoader, PageTitlePositioning } from '@ngx-meta/core'
import { ClipboardModule } from 'ngx-clipboard' import { ClipboardModule } from 'ngx-clipboard'
import { HotkeyModule } from '@app/core/hotkeys'
import { IHotkeyOptions } from 'angular2-hotkeys'
import 'focus-visible' import 'focus-visible'
import { AppRoutingModule } from './app-routing.module' import { AppRoutingModule } from './app-routing.module'
@ -48,9 +46,6 @@ export function metaFactory (serverService: ServerService): MetaLoader {
BrowserModule, BrowserModule,
// FIXME: https://github.com/maxisam/ngx-clipboard/issues/133 // FIXME: https://github.com/maxisam/ngx-clipboard/issues/133
ClipboardModule, ClipboardModule,
HotkeyModule.forRoot({
cheatSheetCloseEsc: true
} as IHotkeyOptions),
CoreModule, CoreModule,
SharedModule, SharedModule,

View File

@ -15,6 +15,8 @@ import { throwIfAlreadyLoaded } from './module-import-guard'
import { LoginGuard, RedirectService, UserRightGuard } from './routing' import { LoginGuard, RedirectService, UserRightGuard } from './routing'
import { ServerService } from './server' import { ServerService } from './server'
import { ThemeService } from './theme' import { ThemeService } from './theme'
import { HotkeyModule } from 'angular2-hotkeys'
import { CheatSheetComponent } from '@app/core/hotkeys'
@NgModule({ @NgModule({
imports: [ imports: [
@ -27,11 +29,16 @@ import { ThemeService } from './theme'
LoadingBarHttpClientModule, LoadingBarHttpClientModule,
LoadingBarRouterModule, LoadingBarRouterModule,
LoadingBarModule.forRoot() LoadingBarModule.forRoot(),
HotkeyModule.forRoot({
cheatSheetCloseEsc: true
})
], ],
declarations: [ declarations: [
ConfirmComponent ConfirmComponent,
CheatSheetComponent
], ],
exports: [ exports: [
@ -39,7 +46,8 @@ import { ThemeService } from './theme'
LoadingBarHttpClientModule, LoadingBarHttpClientModule,
LoadingBarModule, LoadingBarModule,
ConfirmComponent ConfirmComponent,
CheatSheetComponent
], ],
providers: [ providers: [

View File

@ -9,8 +9,8 @@ import { HotkeysService, Hotkey } from 'angular2-hotkeys'
styleUrls: [ './hotkeys.component.scss' ] styleUrls: [ './hotkeys.component.scss' ]
}) })
export class CheatSheetComponent implements OnInit, OnDestroy { export class CheatSheetComponent implements OnInit, OnDestroy {
helpVisible = false
@Input() title = this.i18n('Keyboard Shortcuts:') @Input() title = this.i18n('Keyboard Shortcuts:')
helpVisible = false
subscription: Subscription subscription: Subscription
hotkeys: Hotkey[] hotkeys: Hotkey[]

View File

@ -1,23 +0,0 @@
import { NgModule, ModuleWithProviders } from '@angular/core'
import { CommonModule } from '@angular/common'
import { HotkeysDirective, IHotkeyOptions, HotkeyOptions, HotkeysService } from 'angular2-hotkeys'
import { CheatSheetComponent } from './hotkeys.component'
export * from './hotkeys.component'
@NgModule({
imports : [CommonModule],
exports : [HotkeysDirective, CheatSheetComponent],
declarations : [HotkeysDirective, CheatSheetComponent]
})
export class HotkeyModule {
static forRoot (options: IHotkeyOptions = {}): ModuleWithProviders {
return {
ngModule : HotkeyModule,
providers : [
HotkeysService,
{ provide : HotkeyOptions, useValue : options }
]
}
}
}

View File

@ -1 +1 @@
export * from './hotkeys.module' export * from './hotkeys.component'