openlp
/
web-remote
mirror of https://gitlab.com/openlp/web-remote.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'fix-login' into 'master' 

Reinserting the login button

Closes #34

See merge request openlp/web-remote!59
This commit is contained in:
Raoul Snyman 2023-02-16 16:25:30 +00:00
parent ca9ca91ac9 d33f131479
commit d29eddb781
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/app/app.component.html
View File

@ -3,6 +3,7 @@
<button mat-icon-button (click)="menu.toggle()"><mat-icon>menu</mat-icon></button>
<span class="page-title">{{pageTitle}}</span>
<span class="spacer"></span>
<button *ngIf="showLogin" mat-button (click)="login()">Login</button>
<button
mat-icon-button
(click)="forceWebSocketReconnection()"

11
src/app/hotkeys.service.ts
View File

@ -23,10 +23,13 @@ export class HotKeysService {
return new Observable(observer => {
const handler = (e: KeyboardEvent) => {
if (document.URL.endsWith('/slides'))
{
e.preventDefault();
observer.next(e);
const activeElement = this.document.activeElement;
const notOnInput = activeElement?.tagName !== 'INPUT' && activeElement?.tagName !== 'TEXTAREA';
if (notOnInput) {
if (document.URL.endsWith('/slides')) {
e.preventDefault();
observer.next(e);
}
}
};