Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix timezone conversion logic #11444

Merged
merged 3 commits into from
May 20, 2024
Merged

Fix timezone conversion logic #11444

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e674909
Fix timezone conversion logic
NickM-27 May 20, 2024
fc23e25
Use function for consistency
NickM-27 May 20, 2024
a101597
Cleanup
NickM-27 May 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Cleanup
  • Loading branch information
@NickM-27
NickM-27 committed May 20, 2024
commit a101597d7633c37f29724b87c01cff0b432d3d40
2 changes: 1 addition & 1 deletion web/src/components/player/dynamic/DynamicVideoPlayer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import ActivityIndicator from "@/components/indicators/activity-indicator";
import { VideoResolutionType } from "@/types/live";
import axios from "axios";
import { cn } from "@/lib/utils";
import { getTimestampOffset, getUTCOffset } from "@/utils/dateUtil";
import { getTimestampOffset } from "@/utils/dateUtil";

/**
* Dynamically switches between video playback and scrubbing preview player.
Expand Down
2 changes: 1 addition & 1 deletion web/src/utils/timelineUtil.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import {
MdOutlinePictureInPictureAlt,
} from "react-icons/md";
import { FaBicycle } from "react-icons/fa";
import { endOfHourOrCurrentTime, getUTCOffset } from "./dateUtil";
import { endOfHourOrCurrentTime } from "./dateUtil";
import { TimeRange, Timeline } from "@/types/timeline";

export function getTimelineIcon(timelineItem: Timeline) {
Expand Down
Loading