mirror of
https://gitlab.com/openlp/web-remote.git
synced 2024-12-22 11:32:47 +00:00
Reinserting the login button
This commit is contained in:
parent
ca9ca91ac9
commit
d33f131479
@ -3,6 +3,7 @@
|
|||||||
<button mat-icon-button (click)="menu.toggle()"><mat-icon>menu</mat-icon></button>
|
<button mat-icon-button (click)="menu.toggle()"><mat-icon>menu</mat-icon></button>
|
||||||
<span class="page-title">{{pageTitle}}</span>
|
<span class="page-title">{{pageTitle}}</span>
|
||||||
<span class="spacer"></span>
|
<span class="spacer"></span>
|
||||||
|
<button *ngIf="showLogin" mat-button (click)="login()">Login</button>
|
||||||
<button
|
<button
|
||||||
mat-icon-button
|
mat-icon-button
|
||||||
(click)="forceWebSocketReconnection()"
|
(click)="forceWebSocketReconnection()"
|
||||||
|
@ -23,11 +23,14 @@ export class HotKeysService {
|
|||||||
|
|
||||||
return new Observable(observer => {
|
return new Observable(observer => {
|
||||||
const handler = (e: KeyboardEvent) => {
|
const handler = (e: KeyboardEvent) => {
|
||||||
if (document.URL.endsWith('/slides'))
|
const activeElement = this.document.activeElement;
|
||||||
{
|
const notOnInput = activeElement?.tagName !== 'INPUT' && activeElement?.tagName !== 'TEXTAREA';
|
||||||
|
if (notOnInput) {
|
||||||
|
if (document.URL.endsWith('/slides')) {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
observer.next(e);
|
observer.next(e);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const dispose = this.eventManager.addEventListener(
|
const dispose = this.eventManager.addEventListener(
|
||||||
|
Loading…
Reference in New Issue
Block a user