Fix various small issues.
This commit is contained in:
+2
-9
@@ -189,9 +189,6 @@ class FrigateCard extends LitElement {
|
|||||||
@state()
|
@state()
|
||||||
protected _expand = false;
|
protected _expand = false;
|
||||||
|
|
||||||
@state()
|
|
||||||
protected _viewDisplayMode?: ViewDisplayMode;
|
|
||||||
|
|
||||||
protected _microphoneController?: MicrophoneController;
|
protected _microphoneController?: MicrophoneController;
|
||||||
protected _conditionController?: ConditionController;
|
protected _conditionController?: ConditionController;
|
||||||
protected _automationsController?: AutomationsController;
|
protected _automationsController?: AutomationsController;
|
||||||
@@ -503,7 +500,7 @@ class FrigateCard extends LitElement {
|
|||||||
if (cameraID) {
|
if (cameraID) {
|
||||||
const viewName = args?.viewName ?? this._getConfig().view.default;
|
const viewName = args?.viewName ?? this._getConfig().view.default;
|
||||||
const displayMode =
|
const displayMode =
|
||||||
this._viewDisplayMode ?? this._getDefaultDisplayModeForView(viewName);
|
this._view?.displayMode ?? this._getDefaultDisplayModeForView(viewName);
|
||||||
changeView(
|
changeView(
|
||||||
new View({
|
new View({
|
||||||
view: viewName,
|
view: viewName,
|
||||||
@@ -1067,6 +1064,7 @@ class FrigateCard extends LitElement {
|
|||||||
protected _getDefaultDisplayModeForView(view: FrigateCardView): ViewDisplayMode {
|
protected _getDefaultDisplayModeForView(view: FrigateCardView): ViewDisplayMode {
|
||||||
let mode: ViewDisplayMode | null = null;
|
let mode: ViewDisplayMode | null = null;
|
||||||
switch (view) {
|
switch (view) {
|
||||||
|
case 'media':
|
||||||
case 'clip':
|
case 'clip':
|
||||||
case 'clips':
|
case 'clips':
|
||||||
case 'recording':
|
case 'recording':
|
||||||
@@ -1238,11 +1236,6 @@ class FrigateCard extends LitElement {
|
|||||||
});
|
});
|
||||||
break;
|
break;
|
||||||
case 'display_mode_select':
|
case 'display_mode_select':
|
||||||
this._viewDisplayMode = frigateCardAction.display_mode;
|
|
||||||
this._conditionController?.setState({
|
|
||||||
displayMode: this._viewDisplayMode,
|
|
||||||
});
|
|
||||||
|
|
||||||
const newView = this._view?.evolve({
|
const newView = this._view?.evolve({
|
||||||
displayMode: frigateCardAction.display_mode,
|
displayMode: frigateCardAction.display_mode,
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -482,7 +482,7 @@ export class FrigateCardTimelineCore extends LitElement {
|
|||||||
const canSeek = this._shouldSupportSeeking();
|
const canSeek = this._shouldSupportSeeking();
|
||||||
const newResults =
|
const newResults =
|
||||||
this._panBehavior === 'seek-in-media'
|
this._panBehavior === 'seek-in-media'
|
||||||
? null
|
? results
|
||||||
: results
|
: results
|
||||||
.clone()
|
.clone()
|
||||||
.resetSelectedResult()
|
.resetSelectedResult()
|
||||||
|
|||||||
+6
-1
@@ -91,7 +91,12 @@ export class View {
|
|||||||
let currentQueriesView: ClipsOrSnapshots | 'recordings' | null = null;
|
let currentQueriesView: ClipsOrSnapshots | 'recordings' | null = null;
|
||||||
if (MediaQueriesClassifier.areEventQueries(curr.query)) {
|
if (MediaQueriesClassifier.areEventQueries(curr.query)) {
|
||||||
const queries = curr.query.getQueries();
|
const queries = curr.query.getQueries();
|
||||||
if (queries?.every((query) => query.hasClip)) {
|
if (
|
||||||
|
queries?.every((query) => query.hasClip) ||
|
||||||
|
queries?.every(
|
||||||
|
(query) => query.hasClip === undefined && query.hasSnapshot === undefined,
|
||||||
|
)
|
||||||
|
) {
|
||||||
currentQueriesView = 'clips';
|
currentQueriesView = 'clips';
|
||||||
} else if (queries?.every((query) => query.hasSnapshot)) {
|
} else if (queries?.every((query) => query.hasSnapshot)) {
|
||||||
currentQueriesView = 'snapshots';
|
currentQueriesView = 'snapshots';
|
||||||
|
|||||||
Reference in New Issue
Block a user