diff --git a/web/skins/classic/views/js/event.js b/web/skins/classic/views/js/event.js index d762b53d9..ffd4df259 100644 --- a/web/skins/classic/views/js/event.js +++ b/web/skins/classic/views/js/event.js @@ -201,8 +201,9 @@ function changeReplayMode() { } var streamParms = "view=request&request=stream&connkey="+connKey; -if ( auth_hash ) - streamParms += '&auth='+auth_hash; +if ( auth_hash ) { + streamParms += '&auth='+auth_hash; +} var streamCmdTimer = null; var streamStatus = null; @@ -312,7 +313,6 @@ function playClicked( ) { vjsPlay(); //handles fast forward and rewind } } else { -console.log("sending"+streamParms+"&command="+CMD_PLAY); streamReq.send(streamParms+"&command="+CMD_PLAY); streamPlay(); } @@ -600,8 +600,9 @@ 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; + if ( auth_hash ) { + eventParms += '&auth='+auth_hash; + } 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} ); -function actQuery( action, parms ) { +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 ); + if ( auth_hash ) { + actParms += '&auth='+auth_hash; } - actReq.send( actParms ); + if ( parms != null ) { + actParms += "&"+Object.toQueryString(parms); + } + actReq.send(actParms); } function deleteEvent() { diff --git a/web/skins/classic/views/js/montagereview.js b/web/skins/classic/views/js/montagereview.js index bc06deeba..b543770d7 100644 --- a/web/skins/classic/views/js/montagereview.js +++ b/web/skins/classic/views/js/montagereview.js @@ -155,9 +155,8 @@ function getImageSource(monId, time) { 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; - } - + frame_id = Frame.FrameId; + } } else { frame_id = Frame.FrameId; console.log("No NextFrame"); @@ -1011,7 +1010,7 @@ function initPage() { timeFormat: "HH:mm:ss", dateFormat: "yy-mm-dd", //minDate: $j('#minTime').val(), -minDate: -7, + minDate: -7, maxDate: +0, constrainInput: false, onClose: function(newDate, oldData) {