diff --git a/web/skins/classic/views/js/event.js b/web/skins/classic/views/js/event.js index 79893336f..94d47f20b 100644 --- a/web/skins/classic/views/js/event.js +++ b/web/skins/classic/views/js/event.js @@ -201,6 +201,8 @@ function changeReplayMode() { } var streamParms = "view=request&request=stream&connkey="+connKey; +if ( auth_hash ) + streamCmdParms += '&auth='+auth_hash; var streamCmdTimer = null; var streamStatus = null; @@ -268,7 +270,7 @@ function getCmdResponse( respObj, respText ) { } var streamReq = new Request.JSON( { - url: thisUrl, + url: monitorUrl, method: 'get', timeout: AJAX_TIMEOUT, link: 'chain', @@ -310,7 +312,8 @@ function playClicked( ) { vjsPlay(); //handles fast forward and rewind } } else { - streamReq.send( streamParms+"&command="+CMD_PLAY ); +console.log("sending"+streamParms+"&command="+CMD_PLAY); + streamReq.send(streamParms+"&command="+CMD_PLAY); streamPlay(); } } @@ -406,7 +409,7 @@ function streamFastRev( action ) { } }, 500); //500ms is a compromise between smooth reverse and realistic performance } else { - streamReq.send( streamParms+"&command="+CMD_FASTREV ); + streamReq.send(streamParms+"&command="+CMD_FASTREV); } } @@ -597,6 +600,8 @@ var eventReq = new Request.JSON( {url: thisUrl, method: 'get', timeout: AJAX_TIM function eventQuery( eventId ) { var eventParms = "view=request&request=status&entity=event&id="+eventId; + if ( auth_hash ) + eventParms += '&auth='+auth_hash; eventReq.send( eventParms ); } @@ -897,6 +902,8 @@ var actReq = new Request.JSON( {url: thisUrl, method: 'get', timeout: AJAX_TIMEO function actQuery( action, parms ) { var actParms = "view=request&request=event&id="+eventData.Id+"&action="+action; + if ( auth_hash ) + actParms += '&auth='+auth_hash; if ( parms != null ) { actParms += "&"+Object.toQueryString( parms ); } diff --git a/web/skins/classic/views/js/event.js.php b/web/skins/classic/views/js/event.js.php index 5df0be70d..c4d808bca 100644 --- a/web/skins/classic/views/js/event.js.php +++ b/web/skins/classic/views/js/event.js.php @@ -36,6 +36,7 @@ var eventData = { Frames: 'Frames() ?>', MonitorName: 'Name() ?>' }; +var monitorUrl = 'UrlToIndex(); ?>'; var filterQuery = ''; var sortQuery = ''; diff --git a/web/skins/classic/views/js/montagereview.js b/web/skins/classic/views/js/montagereview.js index f95268e5a..06f23170f 100644 --- a/web/skins/classic/views/js/montagereview.js +++ b/web/skins/classic/views/js/montagereview.js @@ -154,9 +154,12 @@ function getImageSource(monId, time) { var duration = Frame.NextTimeStampSecs - Frame.TimeStampSecs; 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) ); - } + } else { + frame_id = Frame.FrameId; + } + } else { - frame_id = Frame['Id']; + frame_id = Frame.FrameId; console.log("No NextFrame"); } Event = events[Frame.EventId];