Archived() ? ' class="archived"' : '' ?>>
|
diff --git a/web/skins/classic/views/js/controlcap.js b/web/skins/classic/views/js/controlcap.js
index c52ab3dd5..a94f14acd 100644
--- a/web/skins/classic/views/js/controlcap.js
+++ b/web/skins/classic/views/js/controlcap.js
@@ -3,21 +3,131 @@ function validateForm( form ) {
// If "Can Move" is enabled, then the end user must also select at least one of the other check boxes (excluding Can Move Diagonally)
if ( form.elements['newControl[CanMove]'].checked ) {
- if ( !(form.elements['newControl[CanMoveCon]'].checked || form.elements['newControl[CanMoveRel]'].checked || form.elements['newControl[CanMoveAbs]'].checked || form.elements['newControl[CanMoveMap]'].checked) ) {
- errors[errors.length] = "In addition to \"Can Move\", you also must select at least one of: \"Can Move Mapped\", \"Can Move Absolute\", \"Can Move Relative\", or \"Can Move Continuous\"";
+ if ( !(
+ form.elements['newControl[CanMoveCon]'].checked
+ ||
+ form.elements['newControl[CanMoveRel]'].checked
+ ||
+ form.elements['newControl[CanMoveAbs]'].checked
+ ||
+ form.elements['newControl[CanMoveMap]'].checked
+ ) ) {
+ errors[errors.length] = 'In addition to "Can Move", you also must select at least one of: "Can Move Mapped", "Can Move Absolute", "Can Move Relative", or "Can Move Continuous"';
}
} else {
// Now lets check for the opposite condition. If any of the boxes below Can Move are checked, but Can Move is not checked then signal an error
- if ( form.elements['newControl[CanMoveCon]'].checked || form.elements['newControl[CanMoveRel]'].checked || form.elements['newControl[CanMoveAbs]'].checked || form.elements['newControl[CanMoveMap]'].checked || form.elements['newControl[CanMoveDiag]'].checked ) {
- errors[errors.length] = "\"Can Move\" must also be selected if any one of the movement types are sleceted";
+ if ( form.elements['newControl[CanMoveCon]'].checked
+ ||
+ form.elements['newControl[CanMoveRel]'].checked
+ ||
+ form.elements['newControl[CanMoveAbs]'].checked
+ ||
+ form.elements['newControl[CanMoveMap]'].checked
+ ||
+ form.elements['newControl[CanMoveDiag]'].checked
+ ) {
+ errors[errors.length] = '"Can Move" must also be selected if any one of the movement types are selected.';
+ }
+ }
+ // If "Can Zoom" is enabled, then the end user must also select at least one of the other check boxes
+ if ( form.elements['newControl[CanZoom]'].checked ) {
+ if ( !(
+ form.elements['newControl[CanZoomCon]'].checked
+ ||
+ form.elements['newControl[CanZoomRel]'].checked
+ ||
+ form.elements['newControl[CanZoomAbs]'].checked
+ ) ) {
+ errors[errors.length] = 'In addition to "Can Zoom", you also must select at least one of: "Can Zoom Absolute", "Can Zoom Relative", or "Can Zoom Continuous"';
+ }
+ } else {
+ // Now lets check for the opposite condition. If any of the boxes below Can Zoom are checked, but Can Zoom is not checked then signal an error
+
+ if ( form.elements['newControl[CanZoomCon]'].checked
+ ||
+ form.elements['newControl[CanZoomRel]'].checked
+ ||
+ form.elements['newControl[CanZoomAbs]'].checked
+ ) {
+ errors[errors.length] = '"Can Move" must also be selected if any one of the zoom types are selected.';
+ }
+ }
+ // If "Can Zoom" is enabled, then the end user must also select at least one of the other check boxes
+ if ( form.elements['newControl[CanFocus]'].checked ) {
+ if ( !(
+ form.elements['newControl[CanFocusCon]'].checked
+ ||
+ form.elements['newControl[CanFocusRel]'].checked
+ ||
+ form.elements['newControl[CanFocusAbs]'].checked
+ ) ) {
+ errors[errors.length] = 'In addition to "Can Focus", you also must select at least one of: "Can Focus Absolute", "Can Focus Relative", or "Can Focus Continuous"';
+ }
+ } else {
+ // Now lets check for the opposite condition. If any of the boxes below Can Zoom are checked, but Can Zoom is not checked then signal an error
+
+ if ( form.elements['newControl[CanFocusCon]'].checked
+ ||
+ form.elements['newControl[CanFocusRel]'].checked
+ ||
+ form.elements['newControl[CanFocusAbs]'].checked
+ ) {
+ errors[errors.length] = '"Can Focus" must also be selected if any one of the focus types are selected.';
+ }
+ }
+ // If "Can White" is enabled, then the end user must also select at least one of the other check boxes
+ if ( form.elements['newControl[CanWhite]'].checked ) {
+ if ( !(
+ form.elements['newControl[CanWhiteCon]'].checked
+ ||
+ form.elements['newControl[CanWhiteRel]'].checked
+ ||
+ form.elements['newControl[CanWhiteAbs]'].checked
+ ) ) {
+ errors[errors.length] = 'In addition to "Can White Balance", you also must select at least one of: "Can White Bal Absolute", "Can White Bal Relative", or "Can White Bal Continuous"';
+ }
+ } else {
+ // Now lets check for the opposite condition. If any of the boxes below Can Zoom are checked, but Can Zoom is not checked then signal an error
+
+ if ( form.elements['newControl[CanWhiteCon]'].checked
+ ||
+ form.elements['newControl[CanWhiteRel]'].checked
+ ||
+ form.elements['newControl[CanWhiteAbs]'].checked
+ ) {
+ errors[errors.length] = '"Can White Balance" must also be selected if any one of the white balance types are selected.';
+ }
+ }
+
+ // If "Can Iris" is enabled, then the end user must also select at least one of the other check boxes
+ if ( form.elements['newControl[CanIris]'].checked ) {
+ if ( !(
+ form.elements['newControl[CanIrisCon]'].checked
+ ||
+ form.elements['newControl[CanIrisRel]'].checked
+ ||
+ form.elements['newControl[CanIrisAbs]'].checked
+ ) ) {
+ errors[errors.length] = 'In addition to "Can Iris", you also must select at least one of: "Can Iris Absolute", "Can Iris Relative", or "Can Iris Continuous"';
+ }
+ } else {
+ // Now lets check for the opposite condition. If any of the boxes below Can Zoom are checked, but Can Zoom is not checked then signal an error
+
+ if ( form.elements['newControl[CanIrisCon]'].checked
+ ||
+ form.elements['newControl[CanIrisRel]'].checked
+ ||
+ form.elements['newControl[CanIrisAbs]'].checked
+ ) {
+ errors[errors.length] = '"Can Iris" must also be selected if any one of the iris types are selected.';
}
}
if ( errors.length ) {
- alert( errors.join( "\n" ) );
- return ( false );
+ alert(errors.join("\n"));
+ return false;
}
- return ( true );
+ return true;
}
diff --git a/web/skins/classic/views/js/event.js b/web/skins/classic/views/js/event.js
index 96f56dbd4..30cc5057c 100644
--- a/web/skins/classic/views/js/event.js
+++ b/web/skins/classic/views/js/event.js
@@ -57,7 +57,7 @@ function setAlarmCues(data) {
function renderAlarmCues(containerEl) {
if ( !( cueFrames && cueFrames.length ) ) {
- console.log("No cue frames for event");
+ console.log('No cue frames for event');
return;
}
// This uses the Delta of the last frame to get the length of the event. I can't help but wonder though
@@ -139,7 +139,7 @@ function setButtonState( element, butClass ) {
element.disabled = false;
}
} else {
- console.log("Element was null in setButtonState");
+ console.log('Element was null in setButtonState');
}
}
@@ -224,7 +224,7 @@ var lastEventId = 0;
var zmsBroke = false; //Use alternate navigation if zms has crashed
function getCmdResponse( respObj, respText ) {
- if ( checkStreamForErrors("getCmdResponse", respObj) ) {
+ if ( checkStreamForErrors('getCmdResponse', respObj) ) {
console.log('Got an error from getCmdResponse');
console.log(respObj);
console.log(respText);
@@ -258,6 +258,7 @@ function getCmdResponse( respObj, respText ) {
if ( streamStatus.paused == true ) {
streamPause( );
} else {
+ console.log('streamStatus.rate: ' + streamStatus.rate);
$j('select[name="rate"]').val(streamStatus.rate*100);
Cookie.write('zmEventRate', streamStatus.rate*100, {duration: 10*365});
streamPlay( );
@@ -309,7 +310,6 @@ function vjsPause() {
function streamPause( ) {
$j('#modeValue').html('Paused');
- $j('select[name="rate"]').val('0');
setButtonState( $('pauseBtn'), 'active' );
setButtonState( $('playBtn'), 'inactive' );
setButtonState( $('fastFwdBtn'), 'unavail' );
@@ -335,7 +335,7 @@ function vjsPlay() { //catches if we change mode programatically
if ( intervalRewind ) {
stopFastRev();
}
- $j('select[name="rate"]').val(vid.playbackRate());
+ $j('select[name="rate"]').val(vid.playbackRate()*100);
Cookie.write('zmEventRate', vid.playbackRate()*100, {duration: 10*365});
streamPlay();
}
@@ -363,7 +363,7 @@ function streamFastFwd( action ) {
if ( rates.indexOf(vid.playbackRate()*100)-1 == -1 ) {
setButtonState($('fastFwdBtn'), 'unavail');
}
- $j('#rate').val(vid.playbackRate());
+ $j('select[name="rate"]').val(vid.playbackRate()*100);
Cookie.write('zmEventRate', vid.playbackRate()*100, {duration: 10*365});
} else {
streamReq.send(streamParms+"&command="+CMD_FASTFWD);
@@ -393,6 +393,7 @@ function streamSlowRev( action ) {
function stopFastRev() {
clearInterval(intervalRewind);
vid.playbackRate(1);
+ $j('select[name="rate"]').val(vid.playbackRate()*100);
Cookie.write('zmEventRate', vid.playbackRate()*100, {duration: 10*365});
revSpeed = .5;
}
@@ -410,7 +411,7 @@ function streamFastRev( action ) {
setButtonState( $('fastRevBtn'), 'unavail' );
}
clearInterval(intervalRewind);
- $j('#rate').val(-revSpeed);
+ $j('select[name="rate"]').val(-revSpeed*100);
Cookie.write('zmEventRate', vid.playbackRate()*100, {duration: 10*365});
intervalRewind = setInterval(function() {
if (vid.currentTime() <= 0) {
@@ -554,9 +555,9 @@ var scroll = null;
var currEventId = null;
var CurEventDefVideoPath = null;
-function getEventResponse( respObj, respText ) {
- if ( checkStreamForErrors( "getEventResponse", respObj ) ) {
- console.log("getEventResponse: errors" );
+function getEventResponse(respObj, respText) {
+ if ( checkStreamForErrors('getEventResponse', respObj) ) {
+ console.log('getEventResponse: errors');
return;
}
@@ -595,7 +596,7 @@ function getEventResponse( respObj, respText ) {
//eventImg.setStyles( { 'width': eventData.width, 'height': eventData.height } );
if ( vid && CurEventDefVideoPath ) {
vid.src({type: 'video/mp4', src: CurEventDefVideoPath}); //Currently mp4 is all we use
- console.log("getEventResponse");
+ console.log('getEventResponse');
initialAlarmCues(eventData.Id);//ajax and render, new event
addVideoTimingTrack(vid, LabelFormat, eventData.MonitorName, eventData.Length, eventData.StartTime);
CurEventDefVideoPath = null;
@@ -657,7 +658,7 @@ var frameBatch = 40;
function loadEventThumb( event, frame, loadImage ) {
var thumbImg = $('eventThumb'+frame.FrameId);
if ( !thumbImg ) {
- console.error( "No holder found for frame "+frame.FrameId );
+ console.error('No holder found for frame '+frame.FrameId);
return;
}
var img = new Asset.image( imagePrefix+frame.EventId+"&fid="+frame.FrameId,
@@ -679,31 +680,31 @@ function loadEventThumb( event, frame, loadImage ) {
);
}
-function loadEventImage( event, frame ) {
- console.debug( "Loading "+event.Id+"/"+frame.FrameId );
+function loadEventImage(event, frame) {
+ console.debug('Loading '+event.Id+'/'+frame.FrameId);
var eventImg = $('eventImage');
var thumbImg = $('eventThumb'+frame.FrameId);
- if ( eventImg.getProperty( 'src' ) != thumbImg.getProperty( 'src' ) ) {
+ if ( eventImg.getProperty('src') != thumbImg.getProperty('src') ) {
var eventImagePanel = $('eventImagePanel');
- if ( eventImagePanel.getStyle( 'display' ) != 'none' ) {
- var lastThumbImg = $('eventThumb'+eventImg.getProperty( 'alt' ));
+ if ( eventImagePanel.getStyle('display') != 'none' ) {
+ var lastThumbImg = $('eventThumb'+eventImg.getProperty('alt'));
lastThumbImg.removeClass('selected');
- lastThumbImg.setOpacity( 1.0 );
+ lastThumbImg.setOpacity(1.0);
}
- $('eventImageBar').setStyle( 'width', event.Width );
- if ( frame.Type=='Alarm' ) {
- $('eventImageStats').removeClass( 'hidden' );
+ $('eventImageBar').setStyle('width', event.Width);
+ if ( frame.Type == 'Alarm' ) {
+ $('eventImageStats').removeClass('hidden');
} else {
- $('eventImageStats').addClass( 'hidden' );
+ $('eventImageStats').addClass('hidden');
}
- thumbImg.addClass( 'selected' );
- thumbImg.setOpacity( 0.5 );
+ thumbImg.addClass('selected');
+ thumbImg.setOpacity(0.5);
- if ( eventImagePanel.getStyle( 'display' ) == 'none' ) {
- eventImagePanel.setOpacity( 0 );
- eventImagePanel.setStyle( 'display', 'inline-block' );
+ if ( eventImagePanel.getStyle('display') == 'none' ) {
+ eventImagePanel.setOpacity(0);
+ eventImagePanel.setStyle('display', 'inline-block');
new Fx.Tween( eventImagePanel, {duration: 500, transition: Fx.Transitions.Sine} ).start( 'opacity', 0, 1 );
}
@@ -715,29 +716,29 @@ function loadEventImage( event, frame ) {
'height': $j('#eventThumbs').height() - $j('#eventImageBar').outerHeight(true)-10
} );
- $('eventImageNo').set( 'text', frame.FrameId );
+ $('eventImageNo').set('text', frame.FrameId);
$('prevImageBtn').disabled = (frame.FrameId==1);
$('nextImageBtn').disabled = (frame.FrameId==event.Frames);
}
}
function hideEventImageComplete() {
- var thumbImg = $('eventThumb'+$('eventImage').getProperty( 'alt' ));
+ var thumbImg = $('eventThumb'+$('eventImage').getProperty('alt'));
if ( thumbImg ) {
thumbImg.removeClass('selected');
- thumbImg.setOpacity( 1.0 );
+ thumbImg.setOpacity(1.0);
} else {
- console.log("Unable to find eventThumb at " + 'eventThumb'+$('eventImage').getProperty( 'alt' ) );
+ console.log('Unable to find eventThumb at eventThumb'+$('eventImage').getProperty('alt'));
}
$('prevImageBtn').disabled = true;
$('nextImageBtn').disabled = true;
- $('eventImagePanel').setStyle( 'display', 'none' );
- $('eventImageStats').addClass( 'hidden' );
+ $('eventImagePanel').setStyle('display', 'none');
+ $('eventImageStats').addClass('hidden');
}
function hideEventImage() {
- if ( $('eventImagePanel').getStyle( 'display' ) != 'none' ) {
- new Fx.Tween( $('eventImagePanel'), {duration: 500, transition: Fx.Transitions.Sine, onComplete: hideEventImageComplete} ).start( 'opacity', 1, 0 );
+ if ( $('eventImagePanel').getStyle('display') != 'none' ) {
+ new Fx.Tween( $('eventImagePanel'), {duration: 500, transition: Fx.Transitions.Sine, onComplete: hideEventImageComplete} ).start('opacity', 1, 0);
}
}
@@ -764,15 +765,15 @@ function resetEventStills() {
}
}
-function getFrameResponse( respObj, respText ) {
- if ( checkStreamForErrors( "getFrameResponse", respObj ) ) {
+function getFrameResponse(respObj, respText) {
+ if ( checkStreamForErrors('getFrameResponse', respObj) ) {
return;
}
var frame = respObj.frameimage;
if ( !eventData ) {
- console.error( "No event "+frame.EventId+" found" );
+ console.error('No event '+frame.EventId+' found');
return;
}
@@ -782,21 +783,21 @@ function getFrameResponse( respObj, respText ) {
eventData['frames'][frame.FrameId] = frame;
- loadEventThumb( eventData, frame, respObj.loopback=="true" );
+ loadEventThumb(eventData, frame, respObj.loopback=="true");
}
var frameReq = new Request.JSON( {url: thisUrl, method: 'get', timeout: AJAX_TIMEOUT, link: 'chain', onSuccess: getFrameResponse} );
function frameQuery( eventId, frameId, loadImage ) {
var parms = "view=request&request=status&entity=frameimage&id[0]="+eventId+"&id[1]="+frameId+"&loopback="+loadImage;
- frameReq.send( parms );
+ frameReq.send(parms);
}
var currFrameId = null;
function checkFrames( eventId, frameId, loadImage ) {
if ( !eventData ) {
- console.error( "No event "+eventId+" found" );
+ console.error("No event "+eventId+" found");
return;
}
@@ -817,29 +818,30 @@ function checkFrames( eventId, frameId, loadImage ) {
for ( var fid = loFid; fid <= hiFid; fid++ ) {
if ( !$('eventThumb'+fid) ) {
- var img = new Element( 'img', {'id': 'eventThumb'+fid, 'src': 'graphics/transparent.png', 'alt': fid, 'class': 'placeholder'} );
- img.addEvent( 'click', function() {
- eventData['frames'][fid] = null; checkFrames( eventId, fid );
- } );
- frameQuery( eventId, fid, loadImage && (fid == frameId) );
- var imgs = $('eventThumbs').getElements( 'img' );
+ var img = new Element('img', {'id': 'eventThumb'+fid, 'src': 'graphics/transparent.png', 'alt': fid, 'class': 'placeholder'});
+ img.addEvent('click', function() {
+ eventData['frames'][fid] = null;
+ checkFrames(eventId, fid);
+ });
+ frameQuery(eventId, fid, loadImage && (fid == frameId));
+ var imgs = $('eventThumbs').getElements('img');
var injected = false;
if ( fid < imgs.length ) {
- img.inject( imgs[fid-1], 'before' );
+ img.inject(imgs[fid-1], 'before');
injected = true;
} else {
injected = imgs.some(
function( thumbImg, index ) {
- if ( parseInt(img.getProperty( 'alt' )) < parseInt(thumbImg.getProperty( 'alt' )) ) {
- img.inject( thumbImg, 'before' );
- return ( true );
+ if ( parseInt(img.getProperty('alt')) < parseInt(thumbImg.getProperty('alt')) ) {
+ img.inject(thumbImg, 'before');
+ return true;
}
- return ( false );
+ return false;
}
);
}
if ( !injected ) {
- img.inject( $('eventThumbs') );
+ img.inject($('eventThumbs'));
}
var scale = parseInt(img.getStyle('height'));
img.setStyles( {
@@ -936,7 +938,7 @@ function deleteEvent() {
getActResponse(respObj, respText);
// We must wait for the deletion to happen before navigating to the next
// event or this request will be cancelled.
- streamNext( true );
+ streamNext(true);
},
});
deleteReq.send("view=request&request=event&id="+eventData.Id+"&action=delete");
@@ -944,43 +946,43 @@ function deleteEvent() {
function renameEvent() {
var newName = $('eventName').get('value');
- actQuery( 'rename', {eventName: newName} );
+ actQuery('rename', {eventName: newName});
}
function editEvent() {
- createPopup( '?view=eventdetail&eid='+eventData.Id, 'zmEventDetail', 'eventdetail' );
+ createPopup('?view=eventdetail&eid='+eventData.Id, 'zmEventDetail', 'eventdetail');
}
function exportEvent() {
- createPopup( '?view=export&eid='+eventData.Id, 'zmExport', 'export' );
+ createPopup('?view=export&eid='+eventData.Id, 'zmExport', 'export');
}
function archiveEvent() {
- actQuery( 'archive' );
+ actQuery('archive');
}
function unarchiveEvent() {
- actQuery( 'unarchive' );
+ actQuery('unarchive');
}
function showEventFrames() {
- createPopup( '?view=frames&eid='+eventData.Id, 'zmFrames', 'frames', WEB_LIST_THUMB_WIDTH, WEB_LIST_THUMB_HEIGHT );
+ createPopup('?view=frames&eid='+eventData.Id, 'zmFrames', 'frames', WEB_LIST_THUMB_WIDTH, WEB_LIST_THUMB_HEIGHT);
}
function showStream() {
- $('eventStills').addClass( 'hidden' );
- $('eventVideo').removeClass( 'hidden' );
+ $('eventStills').addClass('hidden');
+ $('eventVideo').removeClass('hidden');
- $('stillsEvent').removeClass( 'hidden' );
- $('streamEvent').addClass( 'hidden' );
+ $('stillsEvent').removeClass('hidden');
+ $('streamEvent').addClass('hidden');
streamMode = 'video';
if (scale == 'auto') changeScale();
}
function showStills() {
- $('eventStills').removeClass( 'hidden' );
- $('eventVideo').addClass( 'hidden' );
+ $('eventStills').removeClass('hidden');
+ $('eventVideo').addClass('hidden');
if (vid && ( vid.paused != true ) ) {
// Pause the video
@@ -991,14 +993,14 @@ function showStills() {
//playButton.innerHTML = "Play";
}
- $('stillsEvent').addClass( 'hidden' );
- $('streamEvent').removeClass( 'hidden' );
+ $('stillsEvent').addClass('hidden');
+ $('streamEvent').removeClass('hidden');
streamMode = 'stills';
pauseClicked();
if ( !scroll ) {
- scroll = new Fx.Scroll( 'eventThumbs', {
+ scroll = new Fx.Scroll('eventThumbs', {
wait: false,
duration: 500,
offset: {'x': 0, 'y': 0},
@@ -1012,17 +1014,17 @@ function showStills() {
function showFrameStats() {
var fid = $('eventImageNo').get('text');
- createPopup( '?view=stats&eid='+eventData.Id+'&fid='+fid, 'zmStats', 'stats', eventData.Width, eventData.Height );
+ createPopup('?view=stats&eid='+eventData.Id+'&fid='+fid, 'zmStats', 'stats', eventData.Width, eventData.Height);
}
function videoEvent() {
- createPopup( '?view=video&eid='+eventData.Id, 'zmVideo', 'video', eventData.Width, eventData.Height );
+ createPopup('?view=video&eid='+eventData.Id, 'zmVideo', 'video', eventData.Width, eventData.Height);
}
// Called on each event load because each event can be a different width
function drawProgressBar() {
var barWidth = $j('#evtStream').width();
- $j('#progressBar').css( 'width', barWidth );
+ $j('#progressBar').css('width', barWidth);
}
// Shows current stream progress.
@@ -1045,8 +1047,8 @@ function progressBarNav() {
function handleClick( event ) {
var target = event.target;
- if (vid) {
- if (target.id != 'videoobj') return; //ignore clicks on control bar
+ if ( vid ) {
+ if (target.id != 'videoobj') return; // ignore clicks on control bar
var x = event.offsetX;
var y = event.offsetY;
} else {
@@ -1054,9 +1056,9 @@ function handleClick( event ) {
var y = event.page.y - $(target).getTop();
}
- if (event.shift || event.shiftKey) {//handle both jquery and mootools
+ if ( event.shift || event.shiftKey ) { // handle both jquery and mootools
streamPan(x, y);
- } else if (vid && event.ctrlKey) { //allow zoom out by control click. useful in fullscreen
+ } else if ( vid && event.ctrlKey ) { // allow zoom out by control click. useful in fullscreen
vjsPanZoom('zoomOut', x, y);
} else {
streamZoomIn(x, y);
@@ -1086,7 +1088,7 @@ function initPage() {
}
} else {
progressBarNav();
- streamCmdTimer = streamQuery.delay( 250 );
+ streamCmdTimer = streamQuery.delay(250);
if ( canStreamNative ) {
var imageFeed = $('imageFeed');
if ( !imageFeed ) {
@@ -1096,19 +1098,19 @@ function initPage() {
if ( !streamImg ) {
streamImg = imageFeed.getElement('object');
}
- $(streamImg).addEvent( 'click', function( event ) {
- handleClick( event );
- } );
+ $(streamImg).addEvent('click', function(event) {
+ handleClick(event);
+ });
}
}
}
nearEventsQuery(eventData.Id);
initialAlarmCues(eventData.Id); //call ajax+renderAlarmCues
- if (scale == "auto") changeScale();
+ if ( scale == 'auto' ) changeScale();
document.querySelectorAll('select[name="rate"]').forEach(function(el) {
el.onchange = window['changeRate'];
});
}
// Kick everything off
-window.addEventListener( 'DOMContentLoaded', initPage );
+window.addEventListener('DOMContentLoaded', initPage);
diff --git a/web/skins/classic/views/js/log.js b/web/skins/classic/views/js/log.js
index b4b6b696a..811fa5f28 100644
--- a/web/skins/classic/views/js/log.js
+++ b/web/skins/classic/views/js/log.js
@@ -172,9 +172,9 @@ function clearLog() {
logReq.cancel();
var clearParms = 'view=request&request=log&task=delete';
- var clearReq = new Request.JSON( {url: thisUrl, method: 'post', timeout: AJAX_TIMEOUT, link: 'cancel', onSuccess: clearResponse} );
- var tbody = $(logTable).getElement( 'tbody' );
- var rows = tbody.getElements( 'tr' );
+ var clearReq = new Request.JSON({url: thisUrl, method: 'post', timeout: AJAX_TIMEOUT, link: 'cancel', onSuccess: clearResponse});
+ var tbody = $(logTable).getElement('tbody');
+ var rows = tbody.getElements('tr');
if ( rows ) {
var minTime = rows[0].getElement('td').get('text');
clearParms += "&minTime="+encodeURIComponent(minTime);
@@ -190,7 +190,7 @@ function filterLog() {
filterFields.each(
function( field ) {
var selector = $('filter['+field+']');
- if ( ! selector ) {
+ if ( !selector ) {
if ( window.console && window.console.log ) {
window.console.log('No selector found for ' + field);
}
@@ -226,9 +226,9 @@ function exportResponse( response ) {
function exportFail( request ) {
$('exportLog').unspin();
- $('exportErrorText').set('text', request.status+' / '+request.statusText );
+ $('exportErrorText').set('text', request.status+' / '+request.statusText);
$('exportError').show();
- Error('Export request failed: '+request.status+' / '+request.statusText );
+ Error('Export request failed: '+request.status+' / '+request.statusText);
}
function exportRequest() {
@@ -237,7 +237,7 @@ function exportRequest() {
$('exportError').hide();
if ( form.validate() ) {
var exportParms = "view=request&request=log&task=export";
- var exportReq = new Request.JSON( {url: thisUrl, method: 'post', link: 'cancel', onSuccess: exportResponse, onFailure: exportFail} );
+ var exportReq = new Request.JSON({url: thisUrl, method: 'post', link: 'cancel', onSuccess: exportResponse, onFailure: exportFail});
var selection = form.getElement('input[name=selector]:checked').get('value');
if ( selection == 'filter' || selection == 'current' ) {
$$('#filters select').each(
@@ -256,7 +256,7 @@ function exportRequest() {
exportParms += "&maxTime="+encodeURIComponent(maxTime);
}
}
- exportReq.send( exportParms+"&"+form.toQueryString() );
+ exportReq.send(exportParms+"&"+form.toQueryString());
$('exportLog').spin();
}
}
@@ -265,7 +265,7 @@ function updateFilterSelectors() {
Object.each(options,
function( values, key ) {
var selector = $('filter['+key+']');
- if ( ! selector ) {
+ if ( !selector ) {
if ( window.console && window.console.log ) {
window.console.log('No selector found for ' + key);
}
diff --git a/web/skins/classic/views/js/monitor.js b/web/skins/classic/views/js/monitor.js
index 9d1fc7d7b..3f962ebfb 100644
--- a/web/skins/classic/views/js/monitor.js
+++ b/web/skins/classic/views/js/monitor.js
@@ -131,9 +131,36 @@ function initPage() {
document.querySelectorAll('select[name="newMonitor[ControlId]"]').forEach(function(el) {
el.onchange = window['loadLocations'].bind(el, el);
});
+ document.querySelectorAll('input[name="newMonitor[WebColour]"]').forEach(function(el) {
+ el.onchange = window['change_WebColour'].bind(el);
+ });
$j('.chosen').chosen();
} // end function initPage()
+function change_WebColour() {
+ $j('#WebSwatch').css(
+ 'backgroundColor',
+ $j('input[name="newMonitor[WebColour]"]').val()
+ );
+}
+
+function getRandomColour() {
+ var letters = '0123456789ABCDEF';
+ var colour = '#';
+ for (var i = 0; i < 6; i++) {
+ colour += letters[Math.floor(Math.random() * 16)];
+ }
+ return colour;
+}
+
+function random_WebColour() {
+ var new_colour = getRandomColour();
+ $j('input[name="newMonitor[WebColour]"]').val(new_colour);
+ $j('#WebSwatch').css(
+ 'backgroundColor', new_colour
+ );
+}
+
window.addEventListener('DOMContentLoaded', initPage);
diff --git a/web/skins/classic/views/js/montagereview.js.php b/web/skins/classic/views/js/montagereview.js.php
index ecea1ba6f..526ce0bb5 100644
--- a/web/skins/classic/views/js/montagereview.js.php
+++ b/web/skins/classic/views/js/montagereview.js.php
@@ -18,7 +18,7 @@ var speedIndex=;
// for history, and fps for live, and dynamically determined (in ms)
var currentDisplayInterval=;
-var playSecsperInterval=1; // How many seconds of recorded image we play per refresh determined by speed (replay rate) and display interval; (default=1 if coming from live)
+var playSecsPerInterval=1; // How many seconds of recorded image we play per refresh determined by speed (replay rate) and display interval; (default=1 if coming from live)
var timerInterval; // milliseconds between interrupts
var timerObj; // object to hold timer interval;
var freeTimeLastIntervals=[]; // Percentage of current interval used in loading most recent image
diff --git a/web/skins/classic/views/js/state.js b/web/skins/classic/views/js/state.js
index 7165c690c..e8b4db36d 100644
--- a/web/skins/classic/views/js/state.js
+++ b/web/skins/classic/views/js/state.js
@@ -54,7 +54,7 @@ $j(document).ready(function() {
url: thisUrl,
data: formData,
dataType: 'html',
- enocde: true
+ timeout: 0
}).done(function(data) {
location.reload();
});
diff --git a/web/skins/classic/views/js/watch.js b/web/skins/classic/views/js/watch.js
index b6127a68d..c151ba3ec 100644
--- a/web/skins/classic/views/js/watch.js
+++ b/web/skins/classic/views/js/watch.js
@@ -44,17 +44,17 @@ function changeScale() {
newHeight = monitorHeight * scale / SCALE_BASE;
}
- Cookie.write( 'zmWatchScale'+monitorId, scale, {duration: 10*365} );
+ Cookie.write('zmWatchScale'+monitorId, scale, {duration: 10*365});
/*Stream could be an applet so can't use moo tools*/
var streamImg = $('liveStream'+monitorId);
if ( streamImg ) {
- streamImg.style.width = newWidth + "px";
- streamImg.style.height = newHeight + "px";
+ streamImg.style.width = newWidth + 'px';
+ streamImg.style.height = newHeight + 'px';
streamImg.src = streamImg.src.replace(/scale=\d+/i, 'scale='+(scale== 'auto' ? autoScale : scale));
} else {
- console.error("No element found for liveStream.");
+ console.error('No element found for liveStream.');
}
}
@@ -64,17 +64,17 @@ var lastAlarmState = STATE_IDLE;
function setAlarmState( currentAlarmState ) {
alarmState = currentAlarmState;
- var stateClass = "";
+ var stateClass = '';
if ( alarmState == STATE_ALARM ) {
- stateClass = "alarm";
+ stateClass = 'alarm';
} else if ( alarmState == STATE_ALERT ) {
- stateClass = "alert";
+ stateClass = 'alert';
}
- $('stateValue').set( 'text', stateStrings[alarmState] );
+ $('stateValue').set('text', stateStrings[alarmState]);
if ( stateClass ) {
- $('stateValue').setProperty( 'class', stateClass );
+ $('stateValue').setProperty('class', stateClass);
} else {
- $('stateValue').removeProperty( 'class' );
+ $('stateValue').removeProperty('class');
}
var isAlarmed = ( alarmState == STATE_ALARM || alarmState == STATE_ALERT );
@@ -114,7 +114,7 @@ function setAlarmState( currentAlarmState ) {
}
if ( monitorType != 'WebSite' ) {
- var streamCmdParms = "view=request&request=stream&connkey="+connKey;
+ var streamCmdParms = 'view=request&request=stream&connkey='+connKey;
if ( auth_hash ) {
streamCmdParms += '&auth='+auth_hash;
}
@@ -141,7 +141,7 @@ function getStreamCmdFailure(xhr) {
console.log(xhr);
}
function getStreamCmdResponse(respObj, respText) {
- watchdogOk("stream");
+ watchdogOk('stream');
if ( streamCmdTimer ) {
streamCmdTimer = clearTimeout(streamCmdTimer);
}
diff --git a/web/skins/classic/views/log.php b/web/skins/classic/views/log.php
index 7dd83ef2a..044a3e788 100644
--- a/web/skins/classic/views/log.php
+++ b/web/skins/classic/views/log.php
@@ -122,9 +122,12 @@ xhtmlHeaders(__FILE__, translate('SystemLog') );
|