ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix eslint

pull/4202/head
Isaac Connor 2022-06-02 16:43:23 -04:00
parent a5f8ea2e82
commit db885cac5a
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/skins/classic/views/js/montagereview.js
View File

@ -904,7 +904,7 @@ function showOneMonitor(monId, event) {
// We know the monitor, need to determine the event based on current time // We know the monitor, need to determine the event based on current time
let url = ''; let url = '';
if ( liveMode != 0 ) { if ( liveMode != 0 ) {
url = '?view=watch&mid=' + monId.toString(); url = '?view=watch&mid=' + monId.toString();
} else { } else {
const Frame = getFrame(monId, currentTimeSecs); const Frame = getFrame(monId, currentTimeSecs);
if ( Frame ) { if ( Frame ) {

14
web/skins/classic/views/js/watch.js
View File

@ -186,9 +186,9 @@ function getStreamCmdResponse(respObj, respText) {
// The get status command can get backed up, in which case we won't be able to get the semaphore and will exit. // The get status command can get backed up, in which case we won't be able to get the semaphore and will exit.
if (respObj.status) { if (respObj.status) {
streamStatus = respObj.status; streamStatus = respObj.status;
$j('#fpsValue').text(streamStatus.fps.toLocaleString(undefined, { minimumFractionDigits:1, maximumFractionDigits:1})); $j('#fpsValue').text(streamStatus.fps.toLocaleString(undefined, {minimumFractionDigits: 1, maximumFractionDigits: 1}));
$j('#capturefpsValue').text(streamStatus.capturefps.toLocaleString(undefined, { minimumFractionDigits:1, maximumFractionDigits:1})); $j('#capturefpsValue').text(streamStatus.capturefps.toLocaleString(undefined, {minimumFractionDigits: 1, maximumFractionDigits: 1}));
$j('#analysisfpsValue').text(streamStatus.analysisfps.toLocaleString(undefined, { minimumFractionDigits:1, maximumFractionDigits:1})); $j('#analysisfpsValue').text(streamStatus.analysisfps.toLocaleString(undefined, {minimumFractionDigits: 1, maximumFractionDigits: 1}));
setAlarmState(streamStatus.state); setAlarmState(streamStatus.state);
@ -443,7 +443,7 @@ function streamCmdFastRev(action) {
} }
function streamCmdZoomIn(x, y) { function streamCmdZoomIn(x, y) {
monitorStream.streamCommand({x: x, y:y, command: CMD_ZOOMIN}); monitorStream.streamCommand({x: x, y: y, command: CMD_ZOOMIN});
} }
function streamCmdZoomOut() { function streamCmdZoomOut() {
@ -455,7 +455,7 @@ function streamCmdScale(scale) {
} }
function streamCmdPan(x, y) { function streamCmdPan(x, y) {
monitorStream.streamCommand({x: x, y:y, command: CMD_pAN}); monitorStream.streamCommand({x: x, y: y, command: CMD_pAN});
} }
function streamCmdQuery() { function streamCmdQuery() {
@ -812,7 +812,7 @@ function initPage() {
} }
if (monitorType != 'WebSite') { if (monitorType != 'WebSite') {
monitorStream = new MonitorStream(monitorData[monIdx]); monitorStream = new MonitorStream(monitorData[monIdx]);
monitorStream.setBottomElement(document.getElementById('dvrControls')); monitorStream.setBottomElement(document.getElementById('dvrControls'));
// Start the fps and status updates. give a random delay so that we don't assault the server // Start the fps and status updates. give a random delay so that we don't assault the server
@ -839,7 +839,7 @@ function initPage() {
enableAlmBtn.prop('title', enableAlmBtn.prop('title') + ': disabled because cannot edit Monitors'); enableAlmBtn.prop('title', enableAlmBtn.prop('title') + ': disabled because cannot edit Monitors');
} }
/* /*
if (streamMode == 'single') { if (streamMode == 'single') {
statusCmdTimer = setTimeout(statusCmdQuery, (Math.random()+0.1)*statusRefreshTimeout); statusCmdTimer = setTimeout(statusCmdQuery, (Math.random()+0.1)*statusRefreshTimeout);
setInterval(watchdogCheck, statusRefreshTimeout*2, 'status'); setInterval(watchdogCheck, statusRefreshTimeout*2, 'status');