From 91e31d91bcfaa67bf143646f9aad5cc17eb06298 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Sun, 6 Oct 2024 20:02:02 -0400 Subject: [PATCH] Load #progressBar once --- web/skins/classic/views/js/event.js | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/web/skins/classic/views/js/event.js b/web/skins/classic/views/js/event.js index 01b9f7678..5cd88efc1 100644 --- a/web/skins/classic/views/js/event.js +++ b/web/skins/classic/views/js/event.js @@ -966,12 +966,12 @@ function drawProgressBar() { // Shows current stream progress. function updateProgressBar() { + if (!eventData) return; if (vid) { - if (!eventData) return; var currentTime = vid.currentTime(); var progressDate = new Date(currentTime); } else { - if (!(eventData && streamStatus)) return; + if (!streamStatus) return; var currentTime = streamStatus.progress; var progressDate = new Date(eventData.StartDateTime); progressDate.setTime(progressDate.getTime() + (streamStatus.progress*1000)); @@ -987,7 +987,8 @@ function updateProgressBar() { // Handles seeking when clicking on the progress bar. function progressBarNav() { console.log('progress'); - $j('#progressBar').click(function(e) { + const progressBar = $j('#progressBar'); + progressBar.click(function(e) { let x = e.pageX - $j(this).offset().left; if (x<0) x=0; const seekTime = (x / $j('#progressBar').width()) * parseFloat(eventData.Length); @@ -997,7 +998,7 @@ function progressBarNav() { console.log("clicked at ", x, seekTime, date.toLocaleTimeString(), "from pageX", e.pageX, "offsetleft", $j(this).offset().left ); streamSeek(seekTime); }); - $j('#progressBar').mouseover(function(e) { + progressBar.mouseover(function(e) { let x = e.pageX - $j(this).offset().left; if (x<0) x=0; const seekTime = (x / $j('#progressBar').width()) * parseFloat(eventData.Length); @@ -1011,11 +1012,11 @@ function progressBarNav() { indicator.style.left = x + 'px'; indicator.setAttribute('title', seekTime); }); - $j('#progressBar').mouseout(function(e) { + progressBar.mouseout(function(e) { const indicator = document.getElementById('indicator'); indicator.style.display = 'none'; }); - $j('#progressBar').mousemove(function(e) { + progressBar.mousemove(function(e) { const bar = $j(this); let x = e.pageX - bar.offset().left; @@ -1033,7 +1034,7 @@ function progressBarNav() { indicator.style.left = x+'px'; indicator.setAttribute('title', seekTime); }); -} +} // end function progressBarNav function handleClick(event) { if (panZoomEnabled) {