Don't need to use clickAllowed anymore.

This commit is contained in:
Dermot Duffy
2023-02-18 14:36:39 -08:00
parent 633a4cbdf8
commit c4db626ee1
3 changed files with 4 additions and 23 deletions
-7
View File
@@ -114,13 +114,6 @@ export class FrigateCardCarousel extends LitElement {
return null; return null;
} }
/**
* Get the carousel.
*/
public carouselClickAllowed(): boolean {
return this._carousel?.clickAllowed() ?? true;
}
/** /**
* Get the carousel. * Get the carousel.
*/ */
+3 -10
View File
@@ -12,14 +12,11 @@ import { customElement, property } from 'lit/decorators.js';
import { classMap } from 'lit/directives/class-map.js'; import { classMap } from 'lit/directives/class-map.js';
import { createRef, ref, Ref } from 'lit/directives/ref.js'; import { createRef, ref, Ref } from 'lit/directives/ref.js';
import thumbnailCarouselStyle from '../scss/thumbnail-carousel.scss'; import thumbnailCarouselStyle from '../scss/thumbnail-carousel.scss';
import { import { ExtendedHomeAssistant, ThumbnailsControlConfig } from '../types.js';
ExtendedHomeAssistant,
ThumbnailsControlConfig,
} from '../types.js';
import { stopEventFromActivatingCardWideActions } from '../utils/action.js'; import { stopEventFromActivatingCardWideActions } from '../utils/action.js';
import { dispatchFrigateCardEvent } from '../utils/basic.js'; import { dispatchFrigateCardEvent } from '../utils/basic.js';
import { View } from '../view/view.js'; import { View } from '../view/view.js';
import { MediaQueriesResults } from "../view/media-queries-results"; import { MediaQueriesResults } from '../view/media-queries-results';
import { FrigateCardCarousel } from './carousel.js'; import { FrigateCardCarousel } from './carousel.js';
import './thumbnail.js'; import './thumbnail.js';
import './carousel.js'; import './carousel.js';
@@ -167,11 +164,7 @@ export class FrigateCardThumbnailCarousel extends LitElement {
?show_favorite_control=${this.config?.show_favorite_control} ?show_favorite_control=${this.config?.show_favorite_control}
?show_timeline_control=${this.config?.show_timeline_control} ?show_timeline_control=${this.config?.show_timeline_control}
@click=${(ev: Event) => { @click=${(ev: Event) => {
if ( if (this.view && this.view.queryResults) {
this.view &&
this.view.queryResults &&
this._refCarousel.value?.carouselClickAllowed()
) {
dispatchFrigateCardEvent<ThumbnailCarouselTap>( dispatchFrigateCardEvent<ThumbnailCarouselTap>(
this, this,
'thumbnail-carousel:tap', 'thumbnail-carousel:tap',
+1 -6
View File
@@ -681,12 +681,7 @@ export class FrigateCardViewerCarousel extends LitElement {
)} )}
title="${media.getTitle() ?? ''}" title="${media.getTitle() ?? ''}"
@click=${() => { @click=${() => {
if ( if (this.viewerConfig?.snapshot_click_plays_clip) {
this._refMediaCarousel.value
?.frigateCardCarousel()
?.carouselClickAllowed() &&
this.viewerConfig?.snapshot_click_plays_clip
) {
this._dispatchRelatedClipView(index); this._dispatchRelatedClipView(index);
} }
}} }}