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

alter setButtonState to take either an id or an element so that we can log the missing element

pull/2867/head
Isaac Connor 2020-03-02 11:52:32 -05:00
parent 4fb1362ac3
commit 967e5ad30f
2 changed files with 71 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
web/skins/classic/js/skin.js
View File

@ -531,7 +531,8 @@ function scaleToFit(baseWidth, baseHeight, scaleEl, bottomEl) {
return {width: Math.floor(newWidth), height: Math.floor(newHeight), autoScale: autoScale};
}
function setButtonState(element, butClass) {
function setButtonState(element_id, butClass) {
var element = $(element_id);
if ( element ) {
element.className = butClass;
if (butClass == 'unavail' || (butClass == 'active' && (element.id == 'pauseBtn' || element.id == 'playBtn'))) {
@ -540,6 +541,6 @@ function setButtonState(element, butClass) {
element.disabled = false;
}
} else {
console.log('Element was null in setButtonState');
console.log('Element was null or not found in setButtonState. id:'+element_id);
}
}

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

@ -197,9 +197,9 @@ function getStreamCmdResponse(respObj, respText) {
$('zoomValue').set('text', streamStatus.zoom);
if ( streamStatus.zoom == '1.0' ) {
setButtonState($('zoomOutBtn'), 'unavail');
setButtonState('zoomOutBtn', 'unavail');
} else {
setButtonState($('zoomOutBtn'), 'inactive');
setButtonState('zoomOutBtn', 'inactive');
}
if ( canEditMonitors ) {
@ -233,7 +233,6 @@ function getStreamCmdResponse(respObj, respText) {
streamCmdParms = streamCmdParms.replace(/auth=\w+/i, 'auth='+streamStatus.auth);
statusCmdParms = statusCmdParms.replace(/auth=\w+/i, 'auth='+streamStatus.auth);
eventCmdParms = eventCmdParms.replace(/auth=\w+/i, 'auth='+streamStatus.auth);
actParms = actParms.replace(/auth=\w+/i, 'auth='+streamStatus.auth);
controlParms = controlParms.replace(/auth=\w+/i, 'auth='+streamStatus.auth);
} // end if have a new auth hash
} // end if respObj.status
@ -261,107 +260,107 @@ function getStreamCmdResponse(respObj, respText) {
}
function streamCmdPause( action ) {
setButtonState( $('pauseBtn'), 'active' );
setButtonState( $('playBtn'), 'inactive' );
setButtonState( $('stopBtn'), 'inactive' );
setButtonState( $('fastFwdBtn'), 'inactive' );
setButtonState( $('slowFwdBtn'), 'inactive' );
setButtonState( $('slowRevBtn'), 'inactive' );
setButtonState( $('fastRevBtn'), 'inactive' );
setButtonState('pauseBtn', 'active');
setButtonState('playBtn', 'inactive');
setButtonState('stopBtn', 'inactive');
setButtonState('fastFwdBtn', 'inactive');
setButtonState('slowFwdBtn', 'inactive');
setButtonState('slowRevBtn', 'inactive');
setButtonState('fastRevBtn', 'inactive');
if ( action ) {
streamCmdReq.send( streamCmdParms+"&command="+CMD_PAUSE );
}
}
function streamCmdPlay( action ) {
setButtonState( $('pauseBtn'), 'inactive' );
setButtonState( $('playBtn'), 'active' );
setButtonState('pauseBtn', 'inactive');
setButtonState('playBtn', 'active');
if ( streamStatus.delayed == true ) {
setButtonState( $('stopBtn'), 'inactive' );
setButtonState( $('fastFwdBtn'), 'inactive' );
setButtonState( $('slowFwdBtn'), 'inactive' );
setButtonState( $('slowRevBtn'), 'inactive' );
setButtonState( $('fastRevBtn'), 'inactive' );
setButtonState('stopBtn', 'inactive');
setButtonState('fastFwdBtn', 'inactive');
setButtonState('slowFwdBtn', 'inactive');
setButtonState('slowRevBtn', 'inactive');
setButtonState('fastRevBtn', 'inactive');
} else {
setButtonState( $('stopBtn'), 'unavail' );
setButtonState( $('fastFwdBtn'), 'unavail' );
setButtonState( $('slowFwdBtn'), 'unavail' );
setButtonState( $('slowRevBtn'), 'unavail' );
setButtonState( $('fastRevBtn'), 'unavail' );
setButtonState('stopBtn', 'unavail');
setButtonState('fastFwdBtn', 'unavail');
setButtonState('slowFwdBtn', 'unavail');
setButtonState('slowRevBtn', 'unavail');
setButtonState('fastRevBtn', 'unavail');
}
if ( action ) {
streamCmdReq.send( streamCmdParms+"&command="+CMD_PLAY );
streamCmdReq.send(streamCmdParms+"&command="+CMD_PLAY);
}
}
function streamCmdStop( action ) {
setButtonState( $('pauseBtn'), 'inactive' );
setButtonState( $('playBtn'), 'unavail' );
setButtonState( $('stopBtn'), 'active' );
setButtonState( $('fastFwdBtn'), 'unavail' );
setButtonState( $('slowFwdBtn'), 'unavail' );
setButtonState( $('slowRevBtn'), 'unavail' );
setButtonState( $('fastRevBtn'), 'unavail' );
setButtonState('pauseBtn', 'inactive');
setButtonState('playBtn', 'unavail');
setButtonState('stopBtn', 'active');
setButtonState('fastFwdBtn', 'unavail');
setButtonState('slowFwdBtn', 'unavail');
setButtonState('slowRevBtn', 'unavail');
setButtonState('fastRevBtn', 'unavail');
if ( action ) {
streamCmdReq.send( streamCmdParms+"&command="+CMD_STOP );
streamCmdReq.send(streamCmdParms+"&command="+CMD_STOP);
}
setButtonState( $('stopBtn'), 'unavail' );
setButtonState( $('playBtn'), 'active' );
setButtonState('stopBtn', 'unavail');
setButtonState('playBtn', 'active');
}
function streamCmdFastFwd( action ) {
setButtonState( $('pauseBtn'), 'inactive' );
setButtonState( $('playBtn'), 'inactive' );
setButtonState( $('stopBtn'), 'inactive' );
setButtonState( $('fastFwdBtn'), 'inactive' );
setButtonState( $('slowFwdBtn'), 'inactive' );
setButtonState( $('slowRevBtn'), 'inactive' );
setButtonState( $('fastRevBtn'), 'inactive' );
setButtonState('pauseBtn', 'inactive');
setButtonState('playBtn', 'inactive');
setButtonState('stopBtn', 'inactive');
setButtonState('fastFwdBtn', 'inactive');
setButtonState('slowFwdBtn', 'inactive');
setButtonState('slowRevBtn', 'inactive');
setButtonState('fastRevBtn', 'inactive');
if ( action ) {
streamCmdReq.send( streamCmdParms+"&command="+CMD_FASTFWD );
streamCmdReq.send(streamCmdParms+"&command="+CMD_FASTFWD);
}
}
function streamCmdSlowFwd( action ) {
setButtonState( $('pauseBtn'), 'inactive' );
setButtonState( $('playBtn'), 'inactive' );
setButtonState( $('stopBtn'), 'inactive' );
setButtonState( $('fastFwdBtn'), 'inactive' );
setButtonState( $('slowFwdBtn'), 'active' );
setButtonState( $('slowRevBtn'), 'inactive' );
setButtonState( $('fastRevBtn'), 'inactive' );
setButtonState('pauseBtn', 'inactive');
setButtonState('playBtn', 'inactive');
setButtonState('stopBtn', 'inactive');
setButtonState('fastFwdBtn', 'inactive');
setButtonState('slowFwdBtn', 'active');
setButtonState('slowRevBtn', 'inactive');
setButtonState('fastRevBtn', 'inactive');
if ( action ) {
streamCmdReq.send( streamCmdParms+"&command="+CMD_SLOWFWD );
streamCmdReq.send(streamCmdParms+"&command="+CMD_SLOWFWD);
}
setButtonState( $('pauseBtn'), 'active' );
setButtonState( $('slowFwdBtn'), 'inactive' );
setButtonState('pauseBtn', 'active');
setButtonState('slowFwdBtn', 'inactive');
}
function streamCmdSlowRev( action ) {
setButtonState( $('pauseBtn'), 'inactive' );
setButtonState( $('playBtn'), 'inactive' );
setButtonState( $('stopBtn'), 'inactive' );
setButtonState( $('fastFwdBtn'), 'inactive' );
setButtonState( $('slowFwdBtn'), 'inactive' );
setButtonState( $('slowRevBtn'), 'active' );
setButtonState( $('fastRevBtn'), 'inactive' );
setButtonState('pauseBtn', 'inactive');
setButtonState('playBtn', 'inactive');
setButtonState('stopBtn', 'inactive');
setButtonState('fastFwdBtn', 'inactive');
setButtonState('slowFwdBtn', 'inactive');
setButtonState('slowRevBtn', 'active');
setButtonState('fastRevBtn', 'inactive');
if ( action ) {
streamCmdReq.send( streamCmdParms+"&command="+CMD_SLOWREV );
streamCmdReq.send(streamCmdParms+"&command="+CMD_SLOWREV);
}
setButtonState( $('pauseBtn'), 'active' );
setButtonState( $('slowRevBtn'), 'inactive' );
setButtonState('pauseBtn', 'active');
setButtonState('slowRevBtn', 'inactive');
}
function streamCmdFastRev( action ) {
setButtonState( $('pauseBtn'), 'inactive' );
setButtonState( $('playBtn'), 'inactive' );
setButtonState( $('stopBtn'), 'inactive' );
setButtonState( $('fastFwdBtn'), 'inactive' );
setButtonState( $('slowFwdBtn'), 'inactive' );
setButtonState( $('slowRevBtn'), 'inactive' );
setButtonState( $('fastRevBtn'), 'inactive' );
setButtonState('pauseBtn', 'inactive');
setButtonState('playBtn', 'inactive');
setButtonState('stopBtn', 'inactive');
setButtonState('fastFwdBtn', 'inactive');
setButtonState('slowFwdBtn', 'inactive');
setButtonState('slowRevBtn', 'inactive');
setButtonState('fastRevBtn', 'inactive');
if ( action ) {
streamCmdReq.send( streamCmdParms+"&command="+CMD_FASTREV );
streamCmdReq.send(streamCmdParms+"&command="+CMD_FASTREV);
}
}