mirror of https://github.com/Chocobozzz/PeerTube
parent
1019aaf8e7
commit
7938f1d5e6
|
@ -1,8 +1,11 @@
|
||||||
<div *ngIf="customCSS" [innerHTML]="customCSS"></div>
|
<div *ngIf="customCSS" [innerHTML]="customCSS"></div>
|
||||||
|
|
||||||
<my-hotkeys-cheatsheet></my-hotkeys-cheatsheet>
|
<my-hotkeys-cheatsheet (hotkeysModalStateChange)="onHotkeysModalStateChange($event)"></my-hotkeys-cheatsheet>
|
||||||
|
|
||||||
<div class="peertube-container" [ngClass]="{ 'user-logged-in': isUserLoggedIn(), 'user-not-logged-in': !isUserLoggedIn() }">
|
<div
|
||||||
|
class="peertube-container"
|
||||||
|
[ngClass]="{ 'user-logged-in': isUserLoggedIn(), 'user-not-logged-in': !isUserLoggedIn(), 'hotkeys-modal-opened': hotkeysModalOpened }"
|
||||||
|
>
|
||||||
<div class="root-header">
|
<div class="root-header">
|
||||||
|
|
||||||
<div class="top-left-block">
|
<div class="top-left-block">
|
||||||
|
|
|
@ -3,6 +3,10 @@
|
||||||
|
|
||||||
.peertube-container {
|
.peertube-container {
|
||||||
padding-bottom: 20px;
|
padding-bottom: 20px;
|
||||||
|
|
||||||
|
&.hotkeys-modal-opened {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.main-row {
|
.main-row {
|
||||||
|
|
|
@ -49,6 +49,7 @@ export class AppComponent implements OnInit, AfterViewInit {
|
||||||
|
|
||||||
customCSS: SafeHtml
|
customCSS: SafeHtml
|
||||||
broadcastMessage: { message: string, dismissable: boolean, class: string } | null = null
|
broadcastMessage: { message: string, dismissable: boolean, class: string } | null = null
|
||||||
|
hotkeysModalOpened = false
|
||||||
|
|
||||||
private serverConfig: HTMLServerConfig
|
private serverConfig: HTMLServerConfig
|
||||||
|
|
||||||
|
@ -308,6 +309,8 @@ export class AppComponent implements OnInit, AfterViewInit {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
|
||||||
private initHotkeys () {
|
private initHotkeys () {
|
||||||
this.hotkeysService.add([
|
this.hotkeysService.add([
|
||||||
new Hotkey([ '/', 's' ], (event: KeyboardEvent): boolean => {
|
new Hotkey([ '/', 's' ], (event: KeyboardEvent): boolean => {
|
||||||
|
@ -347,6 +350,12 @@ export class AppComponent implements OnInit, AfterViewInit {
|
||||||
])
|
])
|
||||||
}
|
}
|
||||||
|
|
||||||
|
onHotkeysModalStateChange (opened: boolean) {
|
||||||
|
this.hotkeysModalOpened = opened
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
|
||||||
private loadUser () {
|
private loadUser () {
|
||||||
const tokens = this.userLocalStorage.getTokens()
|
const tokens = this.userLocalStorage.getTokens()
|
||||||
if (!tokens) return
|
if (!tokens) return
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
<div class="cfp-hotkeys-container fade" [ngClass]="{'in': helpVisible}">
|
<div class="cfp-hotkeys-container fade" [ngClass]="{'in': helpVisible}">
|
||||||
<div class="cfp-hotkeys">
|
<div class="cfp-hotkeys">
|
||||||
<h4 class="cfp-hotkeys-title">{{ title }}</h4>
|
<h1 class="cfp-hotkeys-title">{{ title }}</h1>
|
||||||
|
|
||||||
<ul role="presentation">
|
<ul role="presentation">
|
||||||
<li *ngFor="let hotkey of hotkeys">
|
<li *ngFor="let hotkey of hotkeys">
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
import { Hotkey, HotkeysService } from 'angular2-hotkeys'
|
import { Hotkey, HotkeysService } from 'angular2-hotkeys'
|
||||||
import { Subscription } from 'rxjs'
|
import { Subscription } from 'rxjs'
|
||||||
import { Component, Input, OnDestroy, OnInit } from '@angular/core'
|
import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core'
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'my-hotkeys-cheatsheet',
|
selector: 'my-hotkeys-cheatsheet',
|
||||||
|
@ -9,6 +9,9 @@ import { Component, Input, OnDestroy, OnInit } from '@angular/core'
|
||||||
})
|
})
|
||||||
export class CheatSheetComponent implements OnInit, OnDestroy {
|
export class CheatSheetComponent implements OnInit, OnDestroy {
|
||||||
@Input() title = $localize`Keyboard Shortcuts:`
|
@Input() title = $localize`Keyboard Shortcuts:`
|
||||||
|
|
||||||
|
@Output() hotkeysModalStateChange = new EventEmitter<boolean>()
|
||||||
|
|
||||||
helpVisible = false
|
helpVisible = false
|
||||||
subscription: Subscription
|
subscription: Subscription
|
||||||
|
|
||||||
|
@ -29,6 +32,8 @@ export class CheatSheetComponent implements OnInit, OnDestroy {
|
||||||
} else {
|
} else {
|
||||||
this.toggleHelpVisible()
|
this.toggleHelpVisible()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
this.hotkeysModalStateChange.emit(this.helpVisible)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue