diff --git a/thrimbletrimmer/scripts/common.js b/thrimbletrimmer/scripts/common.js index 1acdccd..1056c70 100644 --- a/thrimbletrimmer/scripts/common.js +++ b/thrimbletrimmer/scripts/common.js @@ -1,7 +1,8 @@ var DateTime = luxon.DateTime; var Interval = luxon.Interval; +luxon.Settings.defaultZone = "utc"; -var globalBusStartTime = DateTime.fromISO("1970-01-01T00:00:00", { zone: "utc" }); +var globalBusStartTime = DateTime.fromISO("1970-01-01T00:00:00"); var globalStreamName = ""; var globalStartTimeString = ""; var globalEndTimeString = ""; @@ -131,7 +132,7 @@ function formatIntervalForDisplay(interval) { } function dateTimeFromWubloaderTime(wubloaderTime) { - return DateTime.fromISO(wubloaderTime, { zone: "utc" }); + return DateTime.fromISO(wubloaderTime); } function wubloaderTimeFromDateTime(dateTime) { diff --git a/thrimbletrimmer/scripts/edit.js b/thrimbletrimmer/scripts/edit.js index 65c853e..1c90711 100644 --- a/thrimbletrimmer/scripts/edit.js +++ b/thrimbletrimmer/scripts/edit.js @@ -234,7 +234,7 @@ async function loadVideoInfo() { async function initializeVideoInfo() { globalStreamName = videoInfo.video_channel; - globalBusStartTime = DateTime.fromISO(videoInfo.bustime_start, { zone: "utc" }); + globalBusStartTime = DateTime.fromISO(videoInfo.bustime_start); let eventStartTime = dateTimeFromWubloaderTime(videoInfo.event_start); let eventEndTime = videoInfo.event_end ? dateTimeFromWubloaderTime(videoInfo.event_end) : null; @@ -1011,7 +1011,7 @@ function dateTimeFromVideoPlayerTime(videoPlayerTime) { if (segmentStartISOTime === undefined) { return null; } - const wubloaderDateTime = DateTime.fromISO(segmentStartISOTime, { zone: "utc" }); + const wubloaderDateTime = DateTime.fromISO(segmentStartISOTime); const offset = videoPlayerTime - segmentStartTime; return wubloaderDateTime.plus({ seconds: offset }); } diff --git a/thrimbletrimmer/scripts/stream.js b/thrimbletrimmer/scripts/stream.js index 02d6caa..ba46082 100644 --- a/thrimbletrimmer/scripts/stream.js +++ b/thrimbletrimmer/scripts/stream.js @@ -53,7 +53,7 @@ async function loadDefaults() { const streamNameField = document.getElementById("stream-time-setting-stream"); streamNameField.value = defaultData.video_channel; - globalBusStartTime = DateTime.fromISO(defaultData.bustime_start, { zone: "utc" }); + globalBusStartTime = DateTime.fromISO(defaultData.bustime_start); } // Gets the start time of the video from settings. Returns an invalid date object if the user entered bad data.