From f7c7f0b8ee2e4366e65de2adf63a36cc75801d19 Mon Sep 17 00:00:00 2001 From: JaxonWright Date: Wed, 27 Apr 2022 23:13:50 -0400 Subject: [PATCH] #26: fix Tesla useragent detection for fullscreen snackbar closes #26 --- src/app/app.component.ts | 2 +- src/app/pages/debug/debug.component.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 0ead7d4..5ff3a62 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -8,7 +8,7 @@ import { MatSnackBar } from '@angular/material/snack-bar'; }) export class AppComponent { title = 'testube'; - teslaUserAgentRegEx = /Tesla\/([0-9]{4}.[0-9]{1,2}.?[0-9]{0,2}.?[0-9]{0,2})-(.*)/g; + teslaUserAgentRegEx = /Tesla\/(develop-)*([0-9]{4}.[0-9]{1,2}.?[0-9]{0,2}.?[0-9]{0,2})-(.*)/g; isFullscreen : boolean; theaterZoomLevel : number = 0.64; // make size 64% of original size to account for ViewPort oddness in Tesla Theater Mode. diff --git a/src/app/pages/debug/debug.component.ts b/src/app/pages/debug/debug.component.ts index ad1be7f..9d33d01 100644 --- a/src/app/pages/debug/debug.component.ts +++ b/src/app/pages/debug/debug.component.ts @@ -18,7 +18,7 @@ export class DebugComponent implements OnInit { zoom: number; maxZoom: number; minZoom: number; - teslaUserAgentRegEx = /Tesla\/([0-9]{4}.[0-9]{1,2}.?[0-9]{0,2}.?[0-9]{0,2})-(.*)/g; + teslaUserAgentRegEx = /Tesla\/(?:develop-)*([0-9]{4}.[0-9]{1,2}.?[0-9]{0,2}.?[0-9]{0,2})-(.*)/g; constructor() {} @@ -41,7 +41,7 @@ export class DebugComponent implements OnInit { getTeslaFirmware(): string { console.log(this.userAgent.match(this.teslaUserAgentRegEx)) - return this.userAgent.match(this.teslaUserAgentRegEx)[0].split('/')[1]; + return this.teslaUserAgentRegEx.exec(this.userAgent)[1]; } getViewport(width: boolean): string {