ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix eslint warnings

This commit is contained in:
Isaac Connor 2019-08-27 16:48:42 -04:00
parent cdb8e056b6
commit dfb65d23bf
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
web/skins/classic/views/js/event.js
View File

@ -201,8 +201,9 @@ function changeReplayMode() {
} }
var streamParms = "view=request&request=stream&connkey="+connKey; var streamParms = "view=request&request=stream&connkey="+connKey;
if ( auth_hash ) if ( auth_hash ) {
streamParms += '&auth='+auth_hash; streamParms += '&auth='+auth_hash;
}
var streamCmdTimer = null; var streamCmdTimer = null;
var streamStatus = null; var streamStatus = null;
@ -312,7 +313,6 @@ function playClicked( ) {
vjsPlay(); //handles fast forward and rewind vjsPlay(); //handles fast forward and rewind
} }
} else { } else {
console.log("sending"+streamParms+"&command="+CMD_PLAY);
streamReq.send(streamParms+"&command="+CMD_PLAY); streamReq.send(streamParms+"&command="+CMD_PLAY);
streamPlay(); streamPlay();
} }
@ -600,8 +600,9 @@ var eventReq = new Request.JSON( {url: thisUrl, method: 'get', timeout: AJAX_TIM
function eventQuery( eventId ) { function eventQuery( eventId ) {
var eventParms = "view=request&request=status&entity=event&id="+eventId; var eventParms = "view=request&request=status&entity=event&id="+eventId;
if ( auth_hash ) if ( auth_hash ) {
eventParms += '&auth='+auth_hash; eventParms += '&auth='+auth_hash;
}
eventReq.send( eventParms ); eventReq.send( eventParms );
} }
@ -900,14 +901,15 @@ function getActResponse( respObj, respText ) {
var actReq = new Request.JSON( {url: thisUrl, method: 'get', timeout: AJAX_TIMEOUT, link: 'cancel', onSuccess: getActResponse} ); var actReq = new Request.JSON( {url: thisUrl, method: 'get', timeout: AJAX_TIMEOUT, link: 'cancel', onSuccess: getActResponse} );
function actQuery( action, parms ) { function actQuery(action, parms) {
var actParms = "view=request&request=event&id="+eventData.Id+"&action="+action; var actParms = "view=request&request=event&id="+eventData.Id+"&action="+action;
if ( auth_hash ) if ( auth_hash ) {
actParms += '&auth='+auth_hash; actParms += '&auth='+auth_hash;
if ( parms != null ) {
actParms += "&"+Object.toQueryString( parms );
} }
actReq.send( actParms ); if ( parms != null ) {
actParms += "&"+Object.toQueryString(parms);
}
actReq.send(actParms);
} }
function deleteEvent() { function deleteEvent() {

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

@ -155,9 +155,8 @@ function getImageSource(monId, time) {
frame_id = Frame.FrameId + parseInt( (NextFrame.FrameId-Frame.FrameId) * ( time-Frame.TimeStampSecs )/duration ); frame_id = Frame.FrameId + parseInt( (NextFrame.FrameId-Frame.FrameId) * ( time-Frame.TimeStampSecs )/duration );
//console.log("Have NextFrame: duration: " + duration + " frame_id = " + frame_id + " from " + NextFrame.FrameId + ' - ' + Frame.FrameId + " time: " + (time-Frame.TimeStampSecs) ); //console.log("Have NextFrame: duration: " + duration + " frame_id = " + frame_id + " from " + NextFrame.FrameId + ' - ' + Frame.FrameId + " time: " + (time-Frame.TimeStampSecs) );
} else { } else {
frame_id = Frame.FrameId; frame_id = Frame.FrameId;
} }
} else { } else {
frame_id = Frame.FrameId; frame_id = Frame.FrameId;
console.log("No NextFrame"); console.log("No NextFrame");
@ -1011,7 +1010,7 @@ function initPage() {
timeFormat: "HH:mm:ss", timeFormat: "HH:mm:ss",
dateFormat: "yy-mm-dd", dateFormat: "yy-mm-dd",
//minDate: $j('#minTime').val(), //minDate: $j('#minTime').val(),
minDate: -7, minDate: -7,
maxDate: +0, maxDate: +0,
constrainInput: false, constrainInput: false,
onClose: function(newDate, oldData) { onClose: function(newDate, oldData) {