Fix media loading to work for HA >= 2021.11

src/patches/ha-camera-stream.ts

@@ -43,21 +43,18 @@ customElements.whenDefined('ha-camera-stream').then(() => {
         return html``;
       }
 
-      // Below .src/@load bindings tweaked to work pre/post:
-      // - https://github.com/home-assistant/frontend/commit/e963735dbabdc2fea8a95aea325952560c727625
       return html`
         ${this._shouldRenderMJPEG
           ? html`
               <img
                 @load=${(e) => {
+                  // TODO: This block can be removed a safe distance from HA 2021.11.
                   if (typeof this._elementResized != 'undefined') {
                     this._elementResized();
                   }
                   dispatchMediaShowEvent(this, e);
                 }}
-                .src=${
-                  (typeof this._connected == 'undefined' ||
-                   this._connected)
+                .src=${typeof this._connected == 'undefined' || this._connected
                   ? computeMJPEGStreamUrl(this.stateObj)
                   : ''}
                 .alt=${`Preview of the ${computeStateName(this.stateObj)} camera.`}

src/patches/ha-hls-player.ts

@@ -9,17 +9,18 @@
 // available as compilation time.
 // ====================================================================
 
-import {
-  TemplateResult,
-  html,
-} from 'lit';
+import { TemplateResult, html } from 'lit';
 import { customElement } from 'lit/decorators.js';
-import { dispatchMediaShowEvent, dispatchPauseEvent, dispatchPlayEvent } from '../common.js';
+import {
+  dispatchMediaShowEvent,
+  dispatchPauseEvent,
+  dispatchPlayEvent,
+} from '../common.js';
 
-customElements.whenDefined("ha-hls-player").then(() => {
-  @customElement("frigate-card-ha-hls-player")
+customElements.whenDefined('ha-hls-player').then(() => {
+  @customElement('frigate-card-ha-hls-player')
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  class FrigateCardHaHlsPlayer extends customElements.get("ha-hls-player") {
+  class FrigateCardHaHlsPlayer extends customElements.get('ha-hls-player') {
     // =====================================================================================
     // Minor modifications from:
     // - https://github.com/home-assistant/frontend/blob/dev/src/components/ha-hls-player.ts
@@ -32,7 +33,10 @@ customElements.whenDefined("ha-hls-player").then(() => {
           ?playsinline=${this.playsInline}
           ?controls=${this.controls}
           @loadeddata=${(e) => {
+            // TODO: This block can be removed a safe distance from HA 2021.11.
+            if (typeof this._elementResized != 'undefined') {
               this._elementResized();
+            }
             dispatchMediaShowEvent(this, e);
           }}
           @pause=${() => dispatchPauseEvent(this)}
@@ -41,4 +45,4 @@ customElements.whenDefined("ha-hls-player").then(() => {
       `;
     }
   }
-})
+});