Merge branch 'master' of github.com:ZoneMinder/zoneminder

ZoneMinder · Oct 3, 2024 · abd3097 · abd3097
2 parents d2514b5 + e306dcf
commit abd3097
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/web/js/MonitorStream.js b/web/js/MonitorStream.js
@@ -224,7 +224,7 @@ function MonitorStream(monitorData) {
     }
   }; // setStreamScale
 
-  this.start = function(delay=500) {
+  this.start = function() {
     if (this.janusEnabled) {
       let server;
       if (ZM_JANUS_PATH) {

diff --git a/web/skins/classic/views/js/event.js b/web/skins/classic/views/js/event.js
@@ -318,7 +318,7 @@ function changeScale() {
     currentScale = newSize.autoScale;
   } else if (scaleSel.indexOf("px") > -1) {
     newSize = scaleToFit(eventData.Width, eventData.Height, eventViewer, false, $j('#wrapperEventVideo')); // Only for calculating the maximum width!
-    let w = h = '';
+    let w, h = w = '';
     if (landscape) {
       w = Math.min(stringToNumber(scaleSel), newSize.width);
       h = w / (eventData.Width / eventData.Height);

diff --git a/web/skins/classic/views/js/montage.js b/web/skins/classic/views/js/montage.js
@@ -583,9 +583,7 @@ function startMonitors() {
 
     const isOut = isOutOfViewport(monitor.getElement());
     if (!isOut.all) {
-      // Start the fps and status updates. give a random delay so that we don't assault the server
-      const delay = Math.round( (Math.random()+0.5)*statusRefreshTimeout );
-      monitors[i].start(delay);
+      monitor.start();
     }
     if ((monitor.type == 'WebSite') && (monitor.refresh > 0)) {
       setInterval(reloadWebSite, monitor.refresh*1000, i);