diff --git a/src/components/gallery.ts b/src/components/gallery.ts index 8c7c4641..45703875 100644 --- a/src/components/gallery.ts +++ b/src/components/gallery.ts @@ -214,8 +214,8 @@ export class FrigateCardGalleryCore extends LitElement { if (this.view) { new View({ view: this.view.is('clips') - ? 'clip-specific' - : 'snapshot-specific', + ? 'clip' + : 'snapshot', camera: this.view.camera, target: this.view.target ?? undefined, childIndex: index, diff --git a/src/components/live.ts b/src/components/live.ts index 640fb9cf..e412a186 100644 --- a/src/components/live.ts +++ b/src/components/live.ts @@ -1,5 +1,3 @@ -// TODO Live scrolling nav buttons disappearing -// TODO can I do away with clip/snapshot-specific? // TODO Live carousel chevron/icons style // TODO call change-event in viewer // TODO editor for live lazy loading @@ -146,7 +144,7 @@ export class FrigateCardLive extends LitElement { const mediaType = browseMediaParams.mediaType; if (mediaType && this.view && ['snapshots', 'clips'].includes(mediaType)) { new View({ - view: mediaType === 'clips' ? 'clip-specific' : 'snapshot-specific', + view: mediaType === 'clips' ? 'clip' : 'snapshot', camera: this.view.camera, target: ev.detail.target, childIndex: ev.detail.childIndex, diff --git a/src/components/viewer.ts b/src/components/viewer.ts index 44a78195..789513a9 100644 --- a/src/components/viewer.ts +++ b/src/components/viewer.ts @@ -445,7 +445,7 @@ export class FrigateCardViewerCarousel extends FrigateCardMediaCarousel { const clipStartTime = BrowseMediaUtil.extractEventStartTime(child); if (clipStartTime && clipStartTime === snapshotStartTime) { return new View({ - view: 'clip-specific', + view: 'clip', camera: this.view.camera, target: clips, childIndex: i, diff --git a/src/types.ts b/src/types.ts index b822e2e7..0df72a66 100644 --- a/src/types.ts +++ b/src/types.ts @@ -31,14 +31,7 @@ const FRIGATE_CARD_VIEWS_USER_SPECIFIED = [ 'image', // Static image. ] as const; -const FRIGATE_CARD_VIEWS_INTERNAL = [ - 'clip-specific', // A specific clip. - 'snapshot-specific', // A specific snapshot. -] as const; - -export type FrigateCardView = - | typeof FRIGATE_CARD_VIEWS_USER_SPECIFIED[number] - | typeof FRIGATE_CARD_VIEWS_INTERNAL[number]; +export type FrigateCardView = typeof FRIGATE_CARD_VIEWS_USER_SPECIFIED[number]; const FRIGATE_MENU_MODES = [ 'none', @@ -578,7 +571,7 @@ const menuConfigSchema = z export type MenuConfig = z.infer; /** - * Event viewer configuration section (clip, snapshot, clip-specific, snapshot-specific). + * Event viewer configuration section (clip, snapshot). */ const viewerConfigDefault = { autoplay_clip: false, diff --git a/src/view.ts b/src/view.ts index a0650b37..cd5a6bab 100644 --- a/src/view.ts +++ b/src/view.ts @@ -82,7 +82,7 @@ export class View { * Determine if a view is for the media viewer. */ public isViewerView(): boolean { - return ['clip', 'clip-specific', 'snapshot', 'snapshot-specific'].includes( + return ['clip', 'snapshot'].includes( this.view, ); } @@ -91,14 +91,14 @@ export class View { * Determine if a view is related to a clip or clips. */ public isClipRelatedView(): boolean { - return ['clip', 'clips', 'clip-specific'].includes(this.view); + return ['clip', 'clips'].includes(this.view); } /** * Determine if a view is related to a snapshot or snapshots. */ public isSnapshotRelatedView(): boolean { - return ['snapshot', 'snapshots', 'snapshot-specific'].includes(this.view); + return ['snapshot', 'snapshots'].includes(this.view); } /**