Skip to content

Commit

Permalink
Merge branch 'master' of github.com:ZoneMinder/zoneminder
Browse files Browse the repository at this point in the history
  • Loading branch information
Isaac Connor committed Oct 3, 2024
2 parents d2514b5 + e306dcf commit abd3097
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion web/js/MonitorStream.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion web/skins/classic/views/js/event.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 1 addition & 3 deletions web/skins/classic/views/js/montage.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit abd3097

Please sign in to comment.