administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2026-04-13 10:37:36 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix merge conflicts

Browse Source
This commit is contained in:
Josh Hawkins 2025-10-16 07:33:37 -05:00
parent ec5234f0ae
commit 672796845b
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
web/src/views/recording/RecordingView.tsx
View File

@ -741,13 +741,13 @@ export function RecordingView({
}} }}
> >
{isDesktop && ( {isDesktop && (
<GenAISummaryDialog <GenAISummaryDialog
review={activeReviewItem} review={activeReviewItem}
onOpen={onAnalysisOpen} onOpen={onAnalysisOpen}
/> />
)} )}
<DynamicVideoPlayer <DynamicVideoPlayer
className={grow} className={grow}
camera={mainCamera} camera={mainCamera}
timeRange={currentTimeRange} timeRange={currentTimeRange}
@ -842,14 +842,14 @@ export function RecordingView({
timeRange={timeRange} timeRange={timeRange}
mainCameraReviewItems={mainCameraReviewItems} mainCameraReviewItems={mainCameraReviewItems}
activeReviewItem={activeReviewItem} activeReviewItem={activeReviewItem}
currentTime={currentTime} currentTime={currentTime}
exportRange={exportMode == "timeline" ? exportRange : undefined} exportRange={exportMode == "timeline" ? exportRange : undefined}
setCurrentTime={setCurrentTime} setCurrentTime={setCurrentTime}
manuallySetCurrentTime={manuallySetCurrentTime} manuallySetCurrentTime={manuallySetCurrentTime}
setScrubbing={setScrubbing} setScrubbing={setScrubbing}
setExportRange={setExportRange} setExportRange={setExportRange}
onAnalysisOpen={onAnalysisOpen} onAnalysisOpen={onAnalysisOpen}
/> />
</div> </div>
</div> </div>
</DetailStreamProvider> </DetailStreamProvider>
@ -965,11 +965,10 @@ function Timeline({
return ( return (
<div <div
className={cn( className={cn(
"relative",
isDesktop isDesktop
? `${timelineType == "timeline" ? "w-[100px]" : timelineType == "detail" ? "w-[30%]" : "w-60"} no-scrollbar overflow-y-auto` ? `${timelineType == "timeline" ? "w-[100px]" : timelineType == "detail" ? "w-[30%]" : "w-60"} no-scrollbar overflow-y-auto`
: `overflow-hidden portrait:flex-grow ${timelineType == "timeline" ? "landscape:w-[100px]" : timelineType == "detail" ? "flex-1" : "landscape:w-[175px]"} ` : `overflow-hidden portrait:flex-grow ${timelineType == "timeline" ? "landscape:w-[100px]" : timelineType == "detail" ? "flex-1" : "landscape:w-[175px]"} `,
} relative`} )}
> >
{isMobile && ( {isMobile && (
<GenAISummaryDialog review={activeReviewItem} onOpen={onAnalysisOpen} /> <GenAISummaryDialog review={activeReviewItem} onOpen={onAnalysisOpen} />