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

Add eslint configuration files extending Google's rules

This commit is contained in:
Matthew Noorenberghe 2017-03-18 00:00:51 -07:00
parent c24853ad11
commit c7955cd1b6
20 changed files with 128 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.eslintignore Normal file
View File

@ -0,0 +1,4 @@
web/api/lib
web/skins/classic/js/jquery-1.11.3.js
web/skins/classic/js/jquery.js
web/tools/mootools

29
.eslintrc.js Normal file
View File

@ -0,0 +1,29 @@
"use strict";
module.exports = {
"env": {
"browser": true,
},
"extends": ["google"],
"rules": {
"brace-style": "off",
"camelcase": "off",
"comma-dangle": "off",
"key-spacing": "off",
"max-len": "off",
"new-cap": ["error", {
capIsNewExceptions: ["Error", "Warning", "Debug", "Polygon_calcArea", "Play", "Stop"],
newIsCapExceptionPattern: "^Asset\.."
}],
"no-array-constructor": "off",
"no-caller": "off",
"no-new-object": "off",
"no-unused-vars": "off",
"no-var": "off",
"object-curly-spacing": "off",
"prefer-rest-params": "off",
"quotes": "off",
"require-jsdoc": "off",
"spaced-comment": "off",
},
};

4
web/js/logger.js
View File

@ -46,7 +46,7 @@ function logReport( level, message, file, line )
return; return;
if ( arguments && arguments.callee && arguments.callee.caller && arguments.callee.caller.name ) if ( arguments && arguments.callee && arguments.callee.caller && arguments.callee.caller.name )
message += ' - '+arguments.callee.caller.caller.name+'()'; message += ' - '+arguments.callee.caller.caller.name+'()';
if ( !debugReq ) if ( !debugReq )
{ {
@ -115,4 +115,4 @@ window.onerror =
function( message, url, line ) function( message, url, line )
{ {
logReport( "ERR", message, url, line ); logReport( "ERR", message, url, line );
} };

4
web/js/overlay.js
View File

@ -84,7 +84,7 @@ var Overlay = new Class({
showAnimation:function() showAnimation:function()
{ {
showOverlay(); showOverlay();
//console.log( "Showing overlay loading" ); //console.log( "Showing overlay loading" );
if ( !this.loading ) if ( !this.loading )
{ {
@ -116,7 +116,7 @@ function setupOverlays()
overlay.getElements('.overlayCloser').each( overlay.getElements('.overlayCloser').each(
function( closer ) function( closer )
{ {
closer.addEvent( 'click', function() { overlay.element.hide(); } ) closer.addEvent( 'click', function() { overlay.element.hide(); } );
} }
); );
overlay.overlayShow = function() { overlay.element.show(); }; overlay.overlayShow = function() { overlay.element.show(); };

2
web/skins/classic/js/classic.js
View File

@ -33,7 +33,7 @@ var popupSizes = {
'device': { 'width': 260, 'height': 150 }, 'device': { 'width': 260, 'height': 150 },
'devices': { 'width': 400, 'height': 240 }, 'devices': { 'width': 400, 'height': 240 },
'donate': { 'width': 500, 'height': 280 }, 'donate': { 'width': 500, 'height': 280 },
'event': { 'addWidth': 108, 'minWidth': 496, 'addHeight': 230, minHeight: 540 }, 'event': { 'addWidth': 108, 'minWidth': 496, 'addHeight': 230, 'minHeight': 540 },
'eventdetail': { 'width': 600, 'height': 220 }, 'eventdetail': { 'width': 600, 'height': 220 },
'events': { 'width': 960, 'height': 780 }, 'events': { 'width': 960, 'height': 780 },
'export': { 'width': 400, 'height': 340 }, 'export': { 'width': 400, 'height': 340 },

2
web/skins/classic/js/dark.js
View File

@ -33,7 +33,7 @@ var popupSizes = {
'device': { 'width': 260, 'height': 150 }, 'device': { 'width': 260, 'height': 150 },
'devices': { 'width': 400, 'height': 240 }, 'devices': { 'width': 400, 'height': 240 },
'donate': { 'width': 500, 'height': 280 }, 'donate': { 'width': 500, 'height': 280 },
'event': { 'addWidth': 108, 'minWidth': 496, 'addHeight': 230, minHeight: 540 }, 'event': { 'addWidth': 108, 'minWidth': 496, 'addHeight': 230, 'minHeight': 540 },
'eventdetail': { 'width': 600, 'height': 220 }, 'eventdetail': { 'width': 600, 'height': 220 },
'events': { 'width': 960, 'height': 780 }, 'events': { 'width': 960, 'height': 780 },
'export': { 'width': 400, 'height': 340 }, 'export': { 'width': 400, 'height': 340 },

2
web/skins/classic/js/flat.js
View File

@ -33,7 +33,7 @@ var popupSizes = {
'device': { 'width': 260, 'height': 150 }, 'device': { 'width': 260, 'height': 150 },
'devices': { 'width': 400, 'height': 240 }, 'devices': { 'width': 400, 'height': 240 },
'donate': { 'width': 500, 'height': 280 }, 'donate': { 'width': 500, 'height': 280 },
'event': { 'addWidth': 108, 'minWidth': 496, 'addHeight': 230, minHeight: 540 }, 'event': { 'addWidth': 108, 'minWidth': 496, 'addHeight': 230, 'minHeight': 540 },
'eventdetail': { 'width': 600, 'height': 220 }, 'eventdetail': { 'width': 600, 'height': 220 },
'events': { 'width': 1080, 'height': 780 }, 'events': { 'width': 1080, 'height': 780 },
'export': { 'width': 400, 'height': 340 }, 'export': { 'width': 400, 'height': 340 },

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

@ -31,11 +31,11 @@ function checkSize() {
var h = window.outerHeight; var h = window.outerHeight;
var prevH = h; var prevH = h;
if (h > screen.availHeight) if (h > screen.availHeight)
h = screen.availHeight; h = screen.availHeight;
if (w > screen.availWidth) if (w > screen.availWidth)
w = screen.availWidth; w = screen.availWidth;
if (w != prevW || h != prevH) if (w != prevW || h != prevH)
window.resizeTo(w,h); window.resizeTo(w, h);
} }
} }
@ -56,7 +56,7 @@ function getPopupSize( tag, width, height )
if ( popupSize.width && popupSize.height ) if ( popupSize.width && popupSize.height )
{ {
if ( width || height ) if ( width || height )
Warning( "Ignoring passed dimensions "+width+"x"+height+" when getting popup size for tag '"+tag+"'" ); Warning( "Ignoring passed dimensions "+width+"x"+height+" when getting popup size for tag '"+tag+"'" );
return( popupSize ); return( popupSize );
} }
if ( popupSize.addWidth ) if ( popupSize.addWidth )

27
web/skins/classic/views/js/console.js
View File

@ -25,15 +25,14 @@ function setButtonStates( element )
function addMonitor( element) function addMonitor( element)
{ {
var form = element.form;
var form = element.form; var dupParam;
var dupParam; var monitorId=-1;
var monitorId=-1; if (form.addBtn.value == jsTranslatedCloneText)
if (form.addBtn.value == jsTranslatedCloneText)
{ {
// get the value of the first checkbox // get the value of the first checkbox
for ( var i = 0; i < form.elements.length; i++ ) for ( var i = 0; i < form.elements.length; i++ )
{ {
if ( form.elements[i].type == "checkbox" ) if ( form.elements[i].type == "checkbox" )
{ {
if ( form.elements[i].checked ) if ( form.elements[i].checked )
@ -42,10 +41,10 @@ function addMonitor( element)
break; break;
} }
} }
} }
} }
dupParam = (monitorId == -1 ) ? '': '&dupId='+monitorId; dupParam = (monitorId == -1 ) ? '': '&dupId='+monitorId;
createPopup( '?view=monitor'+dupParam, 'zmMonitor0','monitor' ); createPopup( '?view=monitor'+dupParam, 'zmMonitor0', 'monitor' );
} }
function editMonitor( element ) function editMonitor( element )
@ -85,8 +84,8 @@ function reloadWindow()
function initPage() function initPage()
{ {
jsTranslatedAddText = translatedAddText; jsTranslatedAddText = translatedAddText;
jsTranslatedCloneText = translatedCloneText; jsTranslatedCloneText = translatedCloneText;
reloadWindow.periodical( consoleRefreshTimeout ); reloadWindow.periodical( consoleRefreshTimeout );
if ( showVersionPopup ) if ( showVersionPopup )
createPopup( '?view=version', 'zmVersion', 'version' ); createPopup( '?view=version', 'zmVersion', 'version' );

4
web/skins/classic/views/js/control.js
View File

@ -26,7 +26,7 @@ function controlCmd( control, event, xtell, ytell )
var x = xEvent.page.x - l; var x = xEvent.page.x - l;
var y = xEvent.page.y - t; var y = xEvent.page.y - t;
if ( xtell ) if ( xtell )
{ {
var xge = parseInt( (x*100)/coords.width ); var xge = parseInt( (x*100)/coords.width );
if ( xtell == -1 ) if ( xtell == -1 )
@ -35,7 +35,7 @@ function controlCmd( control, event, xtell, ytell )
xge = 2*(50 - xge); xge = 2*(50 - xge);
locParms += "&xge="+xge; locParms += "&xge="+xge;
} }
if ( ytell ) if ( ytell )
{ {
var yge = parseInt( (y*100)/coords.height ); var yge = parseInt( (y*100)/coords.height );
if ( ytell == -1 ) if ( ytell == -1 )

1
web/skins/classic/views/js/controlcap.js
View File

@ -19,6 +19,5 @@ function validateForm( form ) {
return( false ); return( false );
} }
return( true ); return( true );
} }

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

@ -15,7 +15,7 @@ function changeScale()
streamScale( scale ); streamScale( scale );
Cookie.write( 'zmEventScale'+eventData.MonitorId, scale, { duration: 10*365 } ); Cookie.write( 'zmEventScale'+eventData.MonitorId, scale, { duration: 10*365 } );
/*Stream could be an applet so can't use moo tools*/ /*Stream could be an applet so can't use moo tools*/
var streamImg = document.getElementById('evtStream'); var streamImg = document.getElementById('evtStream');
streamImg.style.width = newWidth + "px"; streamImg.style.width = newWidth + "px";
streamImg.style.height = newHeight + "px"; streamImg.style.height = newHeight + "px";
@ -25,7 +25,7 @@ function changeReplayMode()
{ {
var replayMode = $('replayMode').get('value'); var replayMode = $('replayMode').get('value');
Cookie.write( 'replayMode', replayMode, { duration: 10*365 }) Cookie.write( 'replayMode', replayMode, { duration: 10*365 });
refreshWindow(); refreshWindow();
} }
@ -38,7 +38,7 @@ var lastEventId = 0;
function getCmdResponse( respObj, respText ) function getCmdResponse( respObj, respText )
{ {
if ( checkStreamForErrors( "getCmdResponse" ,respObj ) ) if ( checkStreamForErrors( "getCmdResponse", respObj ) )
return; return;
if ( streamCmdTimer ) if ( streamCmdTimer )
@ -58,7 +58,7 @@ function getCmdResponse( respObj, respText )
$('rate').addClass( 'hidden' ); $('rate').addClass( 'hidden' );
streamPause( false ); streamPause( false );
} }
else else
{ {
$('modeValue').set( 'text', "Replay" ); $('modeValue').set( 'text', "Replay" );
$('rateValue').set( 'text', streamStatus.rate ); $('rateValue').set( 'text', streamStatus.rate );
@ -198,9 +198,9 @@ function streamSeek( offset )
} }
function streamQuery() function streamQuery()
{ {
streamReq.send( streamParms+"&command="+CMD_QUERY ); streamReq.send( streamParms+"&command="+CMD_QUERY );
} }
var slider = null; var slider = null;
var scroll = null; var scroll = null;
@ -438,7 +438,7 @@ function getFrameResponse( respObj, respText )
eventData['frames'] = new Object(); eventData['frames'] = new Object();
eventData['frames'][frame.FrameId] = frame; eventData['frames'][frame.FrameId] = frame;
loadEventThumb( eventData, frame, respObj.loopback=="true" ); loadEventThumb( eventData, frame, respObj.loopback=="true" );
} }
@ -477,7 +477,7 @@ function checkFrames( eventId, frameId, loadImage )
if ( !$('eventThumb'+fid) ) if ( !$('eventThumb'+fid) )
{ {
var img = new Element( 'img', { 'id': 'eventThumb'+fid, 'src': 'graphics/transparent.gif', 'alt': fid, 'class': 'placeholder' } ); var img = new Element( 'img', { 'id': 'eventThumb'+fid, 'src': 'graphics/transparent.gif', 'alt': fid, 'class': 'placeholder' } );
img.addEvent( 'click', function () { eventData['frames'][fid] = null; checkFrames( eventId, fid ) } ); img.addEvent( 'click', function() { eventData['frames'][fid] = null; checkFrames( eventId, fid ); } );
frameQuery( eventId, fid, loadImage && (fid == frameId) ); frameQuery( eventId, fid, loadImage && (fid == frameId) );
var imgs = $('eventThumbs').getElements( 'img' ); var imgs = $('eventThumbs').getElements( 'img' );
var injected = false; var injected = false;
@ -689,7 +689,7 @@ function drawProgressBar()
var offset = parseInt((index*eventData.Length)/$$(cells).length); var offset = parseInt((index*eventData.Length)/$$(cells).length);
$(cell).setProperty( 'title', '+'+secsToTime(offset)+'s' ); $(cell).setProperty( 'title', '+'+secsToTime(offset)+'s' );
$(cell).removeEvent( 'click' ); $(cell).removeEvent( 'click' );
$(cell).addEvent( 'click', function(){ streamSeek( offset ); } ); $(cell).addEvent( 'click', function() { streamSeek( offset ); } );
barWidth += $(cell).getCoordinates().width; barWidth += $(cell).getCoordinates().width;
} }
); );
@ -730,7 +730,7 @@ function handleClick( event )
var target = event.target; var target = event.target;
var x = event.page.x - $(target).getLeft(); var x = event.page.x - $(target).getLeft();
var y = event.page.y - $(target).getTop(); var y = event.page.y - $(target).getTop();
if ( event.shift ) if ( event.shift )
streamPan( x, y ); streamPan( x, y );
else else

1
web/skins/classic/views/js/group.js
View File

@ -9,7 +9,6 @@ if ( refreshParent )
} }
function configureButtons( element ) { function configureButtons( element ) {
if ( canEditGroups ) { if ( canEditGroups ) {
var form = element.form; var form = element.form;
form.saveBtn.disabled = (element.value == 0); form.saveBtn.disabled = (element.value == 0);

30
web/skins/classic/views/js/log.js
View File

@ -22,7 +22,7 @@ var logTimeout = maxSampleTime;
var firstLoad = true; var firstLoad = true;
var initialDisplayLimit = 200; var initialDisplayLimit = 200;
var sortReversed = false; var sortReversed = false;
var filterFields = [ 'Component', 'ServerId', 'Pid', 'Level', 'File', 'Line']; var filterFields = ['Component', 'ServerId', 'Pid', 'Level', 'File', 'Line'];
var options = {}; var options = {};
function buildFetchParms( parms ) function buildFetchParms( parms )
@ -68,7 +68,7 @@ function logResponse( respObj )
maxLogTime = log.TimeKey; maxLogTime = log.TimeKey;
if ( !minLogTime || log.TimeKey < minLogTime ) if ( !minLogTime || log.TimeKey < minLogTime )
minLogTime = log.TimeKey; minLogTime = log.TimeKey;
var row = logTable.push( [ { content: log.DateTime, properties: { style: 'white-space: nowrap' }}, log.Component, log.Server, log.Pid, log.Code, log.Message, log.File, log.Line ] ); var row = logTable.push( [{ content: log.DateTime, properties: { style: 'white-space: nowrap' }}, log.Component, log.Server, log.Pid, log.Code, log.Message, log.File, log.Line] );
delete log.Message; delete log.Message;
row.tr.store( 'log', log ); row.tr.store( 'log', log );
if ( log.Level <= -3 ) if ( log.Level <= -3 )
@ -81,7 +81,7 @@ function logResponse( respObj )
row.tr.addClass( 'log-dbg' ); row.tr.addClass( 'log-dbg' );
if ( !firstLoad ) if ( !firstLoad )
{ {
var color = document.defaultView.getComputedStyle(row.tr,null).getPropertyValue('color'); var color = document.defaultView.getComputedStyle(row.tr, null).getPropertyValue('color');
var colorParts = color.match(/^rgb.*\((\d+),\s*(\d+),\s*(\d+)/); var colorParts = color.match(/^rgb.*\((\d+),\s*(\d+),\s*(\d+)/);
rowOrigColor = '#' + parseInt(colorParts[1]).toString(16) + parseInt(colorParts[2]).toString(16) + parseInt(colorParts[3]).toString(16); rowOrigColor = '#' + parseInt(colorParts[1]).toString(16) + parseInt(colorParts[2]).toString(16) + parseInt(colorParts[3]).toString(16);
new Fx.Tween( row.tr, { duration: 10000, transition: Fx.Transitions.Sine } ).start( 'color', '#6495ED', rowOrigColor ); new Fx.Tween( row.tr, { duration: 10000, transition: Fx.Transitions.Sine } ).start( 'color', '#6495ED', rowOrigColor );
@ -90,15 +90,15 @@ function logResponse( respObj )
); );
options = respObj.options; options = respObj.options;
updateFilterSelectors(); updateFilterSelectors();
$('lastUpdate').set('text',respObj.updated); $('lastUpdate').set('text', respObj.updated);
$('logState').set('text',respObj.state); $('logState').set('text', respObj.state);
$('logState').removeClass('ok'); $('logState').removeClass('ok');
$('logState').removeClass('alert'); $('logState').removeClass('alert');
$('logState').removeClass('alarm'); $('logState').removeClass('alarm');
$('logState').addClass(respObj.state); $('logState').addClass(respObj.state);
$('totalLogs').set('text',respObj.total); $('totalLogs').set('text', respObj.total);
$('availLogs').set('text',respObj.available); $('availLogs').set('text', respObj.available);
$('displayLogs').set('text',logCount); $('displayLogs').set('text', logCount);
if ( firstLoad ) if ( firstLoad )
{ {
if ( logCount < displayLimit ) if ( logCount < displayLimit )
@ -123,7 +123,7 @@ function logResponse( respObj )
} }
} }
logTimer = fetchNextLogs.delay( logTimeout ); logTimer = fetchNextLogs.delay( logTimeout );
} }
function refreshLog() function refreshLog()
{ {
@ -151,7 +151,7 @@ function clearLog()
logCount = 0; logCount = 0;
logTimeout = maxSampleTime; logTimeout = maxSampleTime;
displayLimit = initialDisplayLimit; displayLimit = initialDisplayLimit;
$('displayLogs').set('text',logCount); $('displayLogs').set('text', logCount);
options = {}; options = {};
logTable.empty(); logTable.empty();
} }
@ -265,12 +265,12 @@ function updateFilterSelectors()
selector.options[selector.options.length] = new Option( value, label ); selector.options[selector.options.length] = new Option( value, label );
} }
); );
} }
else if ( key == 'ServerId' ) else if ( key == 'ServerId' )
{ {
Object.each(values, Object.each(values,
function( value, label ) function( value, label )
{ {
selector.options[selector.options.length] = new Option( value, label ); selector.options[selector.options.length] = new Option( value, label );
} }
); );
@ -285,7 +285,7 @@ function updateFilterSelectors()
); );
} }
if ( filter[key] ) if ( filter[key] )
selector.set('value',filter[key]); selector.set('value', filter[key]);
} }
); );
} }
@ -315,13 +315,13 @@ function initPage()
if ( sortReversed ) if ( sortReversed )
startIndex = displayLimit; startIndex = displayLimit;
else else
startIndex = 0;; startIndex = 0;
for ( var i = startIndex; logCount > displayLimit; i++ ) for ( var i = startIndex; logCount > displayLimit; i++ )
{ {
rows[i].destroy(); rows[i].destroy();
logCount--; logCount--;
} }
$('displayLogs').set('text',logCount); $('displayLogs').set('text', logCount);
} }
} }
); );

15
web/skins/classic/views/js/montage.js
View File

@ -15,7 +15,7 @@ function Monitor( index, monitorData )
this.start = function( delay ) this.start = function( delay )
{ {
this.streamCmdTimer = this.streamCmdQuery.delay( delay, this ); this.streamCmdTimer = this.streamCmdQuery.delay( delay, this );
} };
this.setStateClass = function( element, stateClass ) this.setStateClass = function( element, stateClass )
{ {
@ -29,7 +29,7 @@ function Monitor( index, monitorData )
element.removeClass( 'idle' ); element.removeClass( 'idle' );
element.addClass( stateClass ); element.addClass( stateClass );
} }
} };
this.getStreamCmdResponse = function( respObj, respText ) this.getStreamCmdResponse = function( respObj, respText )
{ {
@ -58,7 +58,7 @@ function Monitor( index, monitorData )
} }
this.setStateClass( $('monitor'+this.index), stateClass ); this.setStateClass( $('monitor'+this.index), stateClass );
/*Stream could be an applet so can't use moo tools*/ /*Stream could be an applet so can't use moo tools*/
stream.className = stateClass; stream.className = stateClass;
var isAlarmed = ( this.alarmState == STATE_ALARM || this.alarmState == STATE_ALERT ); var isAlarmed = ( this.alarmState == STATE_ALARM || this.alarmState == STATE_ALERT );
@ -93,15 +93,14 @@ function Monitor( index, monitorData )
console.error( respObj.message ); console.error( respObj.message );
// Try to reload the image stream. // Try to reload the image stream.
if ( stream ) if ( stream )
stream.src = stream.src.replace(/rand=\d+/i,'rand='+Math.floor((Math.random() * 1000000) )); stream.src = stream.src.replace(/rand=\d+/i, 'rand='+Math.floor((Math.random() * 1000000) ));
} }
var streamCmdTimeout = statusRefreshTimeout; var streamCmdTimeout = statusRefreshTimeout;
if ( this.alarmState == STATE_ALARM || this.alarmState == STATE_ALERT ) if ( this.alarmState == STATE_ALARM || this.alarmState == STATE_ALERT )
streamCmdTimeout = streamCmdTimeout/5; streamCmdTimeout = streamCmdTimeout/5;
this.streamCmdTimer = this.streamCmdQuery.delay( streamCmdTimeout, this ); this.streamCmdTimer = this.streamCmdQuery.delay( streamCmdTimeout, this );
this.lastAlarmState = this.alarmState; this.lastAlarmState = this.alarmState;
} };
this.streamCmdQuery = function( resent ) this.streamCmdQuery = function( resent )
{ {
@ -109,7 +108,7 @@ function Monitor( index, monitorData )
//console.log( this.connKey+": Resending" ); //console.log( this.connKey+": Resending" );
//this.streamCmdReq.cancel(); //this.streamCmdReq.cancel();
this.streamCmdReq.send( this.streamCmdParms+"&command="+CMD_QUERY ); this.streamCmdReq.send( this.streamCmdParms+"&command="+CMD_QUERY );
} };
this.streamCmdReq = new Request.JSON( { url: this.server_url, method: 'get', timeout: AJAX_TIMEOUT, onSuccess: this.getStreamCmdResponse.bind( this ), onTimeout: this.streamCmdQuery.bind( this, true ), link: 'cancel' } ); this.streamCmdReq = new Request.JSON( { url: this.server_url, method: 'get', timeout: AJAX_TIMEOUT, onSuccess: this.getStreamCmdResponse.bind( this ), onTimeout: this.streamCmdQuery.bind( this, true ), link: 'cancel' } );
@ -134,7 +133,7 @@ function changeScale()
var monitor = monitors[x]; var monitor = monitors[x];
var newWidth = ( monitorData[x].width * scale ) / SCALE_BASE; var newWidth = ( monitorData[x].width * scale ) / SCALE_BASE;
var newHeight = ( monitorData[x].height * scale ) / SCALE_BASE; var newHeight = ( monitorData[x].height * scale ) / SCALE_BASE;
/*Stream could be an applet so can't use moo tools*/ /*Stream could be an applet so can't use moo tools*/
var streamImg = document.getElementById( 'liveStream'+monitor.id ); var streamImg = document.getElementById( 'liveStream'+monitor.id );
streamImg.style.width = newWidth + "px"; streamImg.style.width = newWidth + "px";
streamImg.style.height = newHeight + "px"; streamImg.style.height = newHeight + "px";

2
web/skins/classic/views/js/onvifprobe.js
View File

@ -31,7 +31,7 @@ function configureButtons( element )
if(form.elements.namedItem("nextBtn")) { if(form.elements.namedItem("nextBtn")) {
form.nextBtn.disabled = (form.probe.selectedIndex==0) || form.nextBtn.disabled = (form.probe.selectedIndex==0) ||
(form.username == "") || (form.username == null) || (form.username == "") || (form.username == null) ||
(form.password == "") || (form.password == null); (form.password == "") || (form.password == null);
} }
if(form.elements.namedItem("saveBtn")) { if(form.elements.namedItem("saveBtn")) {
form.saveBtn.disabled = (form.probe.selectedIndex==0); form.saveBtn.disabled = (form.probe.selectedIndex==0);

4
web/skins/classic/views/js/state.js
View File

@ -1,6 +1,5 @@
function checkState( element ) function checkState( element )
{ {
var form = element.form; var form = element.form;
var minIndex = running?2:1; var minIndex = running?2:1;
@ -23,9 +22,8 @@ function checkState( element )
if (element.value.toLowerCase() == 'default' ) if (element.value.toLowerCase() == 'default' )
{ {
form.saveBtn.disabled = false; form.saveBtn.disabled = false;
form.deleteBtn.disabled = true; form.deleteBtn.disabled = true;
} }
} }
function saveState( element ) function saveState( element )

4
web/skins/classic/views/js/timeline.js
View File

@ -114,10 +114,10 @@ function loadEventImage( imagePath, eid, fid, width, height )
var imageSrc = $('imageSrc'); var imageSrc = $('imageSrc');
imageSrc.setProperty( 'src', imagePrefix+imagePath ); imageSrc.setProperty( 'src', imagePrefix+imagePath );
imageSrc.removeEvent( 'click' ); imageSrc.removeEvent( 'click' );
imageSrc.addEvent( 'click', showEvent.pass( [ eid, fid, width, height ] ) ); imageSrc.addEvent( 'click', showEvent.pass( [eid, fid, width, height] ) );
var eventData = $('eventData'); var eventData = $('eventData');
eventData.removeEvent( 'click' ); eventData.removeEvent( 'click' );
eventData.addEvent( 'click', showEvent.pass( [ eid, fid, width, height ] ) ); eventData.addEvent( 'click', showEvent.pass( [eid, fid, width, height] ) );
} }
function tlZoomBounds( minTime, maxTime ) function tlZoomBounds( minTime, maxTime )

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

@ -34,13 +34,13 @@ function changeScale()
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*/ /*Stream could be an applet so can't use moo tools*/
var streamImg = document.getElementById('liveStream'); var streamImg = document.getElementById('liveStream');
if ( streamImg ) { if ( streamImg ) {
streamImg.style.width = newWidth + "px"; streamImg.style.width = newWidth + "px";
streamImg.style.height = newHeight + "px"; streamImg.style.height = newHeight + "px";
streamImg.src = streamImg.src.replace(/scale=\d+/i,'scale='+scale); streamImg.src = streamImg.src.replace(/scale=\d+/i, 'scale='+scale);
} else { } else {
console.error("No element found for liveStream."); console.error("No element found for liveStream.");
} }
@ -168,7 +168,7 @@ function getStreamCmdResponse( respObj, respText )
streamCmdFastRev( false ); streamCmdFastRev( false );
} }
} }
else else
{ {
$('modeValue').set( 'text', "Live" ); $('modeValue').set( 'text', "Live" );
$('rate').addClass( 'hidden' ); $('rate').addClass( 'hidden' );
@ -210,18 +210,18 @@ function getStreamCmdResponse( respObj, respText )
} }
} }
else { else {
checkStreamForErrors("getStreamCmdResponse",respObj);//log them checkStreamForErrors("getStreamCmdResponse", respObj);//log them
// Try to reload the image stream. // Try to reload the image stream.
var streamImg = document.getElementById('liveStream'); var streamImg = document.getElementById('liveStream');
if ( streamImg ) if ( streamImg )
streamImg.src = streamImg.src.replace(/rand=\d+/i,'rand='+Math.floor((Math.random() * 1000000) )); streamImg.src = streamImg.src.replace(/rand=\d+/i, 'rand='+Math.floor((Math.random() * 1000000) ));
} }
var streamCmdTimeout = statusRefreshTimeout; var streamCmdTimeout = statusRefreshTimeout;
if ( alarmState == STATE_ALARM || alarmState == STATE_ALERT ) if ( alarmState == STATE_ALARM || alarmState == STATE_ALERT )
streamCmdTimeout = streamCmdTimeout/5; streamCmdTimeout = streamCmdTimeout/5;
streamCmdTimer = streamCmdQuery.delay( streamCmdTimeout ); streamCmdTimer = streamCmdQuery.delay( streamCmdTimeout );
} }
function streamCmdPause( action ) function streamCmdPause( action )
{ {
@ -354,7 +354,7 @@ function streamCmdPan( x, y )
function streamCmdQuery() function streamCmdQuery()
{ {
streamCmdReq.send( streamCmdParms+"&command="+CMD_QUERY ); streamCmdReq.send( streamCmdParms+"&command="+CMD_QUERY );
} }
var statusCmdParms = "view=request&request=status&entity=monitor&id="+monitorId+"&element[]=Status&element[]=FrameRate"; var statusCmdParms = "view=request&request=status&entity=monitor&id="+monitorId+"&element[]=Status&element[]=FrameRate";
var statusCmdReq = new Request.JSON( { url: monitorUrl+thisUrl, method: 'post', data: statusCmdParms, timeout: AJAX_TIMEOUT, link: 'cancel', onSuccess: getStatusCmdResponse } ); var statusCmdReq = new Request.JSON( { url: monitorUrl+thisUrl, method: 'post', data: statusCmdParms, timeout: AJAX_TIMEOUT, link: 'cancel', onSuccess: getStatusCmdResponse } );
@ -372,18 +372,18 @@ function getStatusCmdResponse( respObj, respText )
setAlarmState( respObj.monitor.Status ); setAlarmState( respObj.monitor.Status );
} }
else else
checkStreamForErrors("getStatusCmdResponse",respObj); checkStreamForErrors("getStatusCmdResponse", respObj);
var statusCmdTimeout = statusRefreshTimeout; var statusCmdTimeout = statusRefreshTimeout;
if ( alarmState == STATE_ALARM || alarmState == STATE_ALERT ) if ( alarmState == STATE_ALARM || alarmState == STATE_ALERT )
statusCmdTimeout = statusCmdTimeout/5; statusCmdTimeout = statusCmdTimeout/5;
statusCmdTimer = statusCmdQuery.delay( statusCmdTimeout ); statusCmdTimer = statusCmdQuery.delay( statusCmdTimeout );
} }
function statusCmdQuery() function statusCmdQuery()
{ {
statusCmdReq.send(); statusCmdReq.send();
} }
var alarmCmdParms = "view=request&request=alarm&id="+monitorId; var alarmCmdParms = "view=request&request=alarm&id="+monitorId;
var alarmCmdReq = new Request.JSON( { url: monitorUrl+thisUrl, method: 'post', timeout: AJAX_TIMEOUT, link: 'cancel', onSuccess: getAlarmCmdResponse, onTimeout: streamCmdQuery } ); var alarmCmdReq = new Request.JSON( { url: monitorUrl+thisUrl, method: 'post', timeout: AJAX_TIMEOUT, link: 'cancel', onSuccess: getAlarmCmdResponse, onTimeout: streamCmdQuery } );
@ -391,7 +391,7 @@ var alarmCmdFirst = true;
function getAlarmCmdResponse( respObj, respText ) function getAlarmCmdResponse( respObj, respText )
{ {
checkStreamForErrors("getAlarmCmdResponse",respObj); checkStreamForErrors("getAlarmCmdResponse", respObj);
} }
function cmdDisableAlarms() function cmdDisableAlarms()
@ -477,26 +477,26 @@ function getEventCmdResponse( respObj, respText )
var cells = row.getElements( 'td' ); var cells = row.getElements( 'td' );
var link = new Element( 'a', { 'href': '#', 'events': { 'click': createEventPopup.pass( [ event.Id, '&trms=1&attr1=MonitorId&op1=%3d&val1='+monitorId+'&page=1', event.Width, event.Height ] ) } }); var link = new Element( 'a', { 'href': '#', 'events': { 'click': createEventPopup.pass( [event.Id, '&trms=1&attr1=MonitorId&op1=%3d&val1='+monitorId+'&page=1', event.Width, event.Height] ) } });
link.set( 'text', event.Id ); link.set( 'text', event.Id );
link.inject( row.getElement( 'td.colId' ) ); link.inject( row.getElement( 'td.colId' ) );
link = new Element( 'a', { 'href': '#', 'events': { 'click': createEventPopup.pass( [ event.Id, '&trms=1&attr1=MonitorId&op1=%3d&val1='+monitorId+'&page=1', event.Width, event.Height ] ) } }); link = new Element( 'a', { 'href': '#', 'events': { 'click': createEventPopup.pass( [event.Id, '&trms=1&attr1=MonitorId&op1=%3d&val1='+monitorId+'&page=1', event.Width, event.Height] ) } });
link.set( 'text', event.Name ); link.set( 'text', event.Name );
link.inject( row.getElement( 'td.colName' ) ); link.inject( row.getElement( 'td.colName' ) );
row.getElement( 'td.colTime' ).set( 'text', event.StartTime ); row.getElement( 'td.colTime' ).set( 'text', event.StartTime );
row.getElement( 'td.colSecs' ).set( 'text', event.Length ); row.getElement( 'td.colSecs' ).set( 'text', event.Length );
link = new Element( 'a', { 'href': '#', 'events': { 'click': createFramesPopup.pass( [ event.Id, event.Width, event.Height ] ) } }); link = new Element( 'a', { 'href': '#', 'events': { 'click': createFramesPopup.pass( [event.Id, event.Width, event.Height] ) } });
link.set( 'text', event.Frames+'/'+event.AlarmFrames ); link.set( 'text', event.Frames+'/'+event.AlarmFrames );
link.inject( row.getElement( 'td.colFrames' ) ); link.inject( row.getElement( 'td.colFrames' ) );
link = new Element( 'a', { 'href': '#', 'events': { 'click': createFramePopup.pass( [ event.Id, '0', event.Width, event.Height ] ) } }); link = new Element( 'a', { 'href': '#', 'events': { 'click': createFramePopup.pass( [event.Id, '0', event.Width, event.Height] ) } });
link.set( 'text', event.AvgScore+'/'+event.MaxScore ); link.set( 'text', event.AvgScore+'/'+event.MaxScore );
link.inject( row.getElement( 'td.colScore' ) ); link.inject( row.getElement( 'td.colScore' ) );
link = new Element( 'a', { 'href': '#', 'title': deleteString, 'events': { 'click': function( e ) { deleteEvent( e, event.Id ); }.bind( link ), 'mouseover': highlightRow.pass( row ), 'mouseout': highlightRow.pass( row ) } }); link = new Element( 'a', { 'href': '#', 'title': deleteString, 'events': { 'click': function( e ) { deleteEvent( e, event.Id ); }, 'mouseover': highlightRow.pass( row ), 'mouseout': highlightRow.pass( row ) } });
link.set( 'text', 'X' ); link.set( 'text', 'X' );
link.inject( row.getElement( 'td.colDelete' ) ); link.inject( row.getElement( 'td.colDelete' ) );
@ -537,7 +537,7 @@ function getEventCmdResponse( respObj, respText )
} }
} }
else else
checkStreamForErrors("getEventCmdResponse",respObj); checkStreamForErrors("getEventCmdResponse", respObj);
var eventCmdTimeout = eventsRefreshTimeout; var eventCmdTimeout = eventsRefreshTimeout;
if ( alarmState == STATE_ALARM || alarmState == STATE_ALERT ) if ( alarmState == STATE_ALARM || alarmState == STATE_ALERT )
@ -581,7 +581,7 @@ function controlCmd( control, event, xtell, ytell )
var x = xEvent.page.x - l; var x = xEvent.page.x - l;
var y = xEvent.page.y - t; var y = xEvent.page.y - t;
if ( xtell ) if ( xtell )
{ {
var xge = parseInt( (x*100)/coords.width ); var xge = parseInt( (x*100)/coords.width );
if ( xtell == -1 ) if ( xtell == -1 )
@ -590,7 +590,7 @@ function controlCmd( control, event, xtell, ytell )
xge = 2*(50 - xge); xge = 2*(50 - xge);
locParms += "&xge="+xge; locParms += "&xge="+xge;
} }
if ( ytell ) if ( ytell )
{ {
var yge = parseInt( (y*100)/coords.height ); var yge = parseInt( (y*100)/coords.height );
if ( ytell == -1 ) if ( ytell == -1 )
@ -614,7 +614,7 @@ function controlCmdImage( x, y )
controlReq.send( imageControlParms+"&x="+x+"&y="+y ); controlReq.send( imageControlParms+"&x="+x+"&y="+y );
if ( streamMode == "single" ) if ( streamMode == "single" )
fetchImage.pass( $('imageFeed').getElement('img') ).delay( 1000 ); fetchImage.pass( $('imageFeed').getElement('img') ).delay( 1000 );
} }
var tempImage = null; var tempImage = null;
function fetchImage( streamImage ) function fetchImage( streamImage )
@ -631,7 +631,7 @@ function handleClick( event )
var target = event.target; var target = event.target;
var x = event.page.x - $(target).getLeft(); var x = event.page.x - $(target).getLeft();
var y = event.page.y - $(target).getTop(); var y = event.page.y - $(target).getTop();
if ( showMode == "events" || !imageControlMode ) if ( showMode == "events" || !imageControlMode )
{ {
if ( event.shift ) if ( event.shift )
@ -706,7 +706,7 @@ function initPage()
streamCmdTimer = streamCmdQuery.delay( (Math.random()+0.1)*statusRefreshTimeout ); streamCmdTimer = streamCmdQuery.delay( (Math.random()+0.1)*statusRefreshTimeout );
watchdogCheck.pass('stream').periodical(statusRefreshTimeout*2); watchdogCheck.pass('stream').periodical(statusRefreshTimeout*2);
} }
eventCmdTimer = eventCmdQuery.delay( (Math.random()+0.1)*statusRefreshTimeout ); eventCmdTimer = eventCmdQuery.delay( (Math.random()+0.1)*statusRefreshTimeout );
watchdogCheck.pass('event').periodical(eventsRefreshTimeout*2); watchdogCheck.pass('event').periodical(eventsRefreshTimeout*2);

23
web/skins/classic/views/js/zone.js
View File

@ -145,7 +145,7 @@ function applyZoneType()
form.elements['newZone[MaxAlarmPixels]'].disabled = false; form.elements['newZone[MaxAlarmPixels]'].disabled = false;
form.elements['newZone[OverloadFrames]'].disabled = false; form.elements['newZone[OverloadFrames]'].disabled = false;
form.elements['newZone[ExtendAlarmFrames]'].disabled = true; form.elements['newZone[ExtendAlarmFrames]'].disabled = true;
applyCheckMethod(); applyCheckMethod();
} }
} }
@ -353,7 +353,7 @@ function updateActivePoint( index )
$('newZone[Points]['+index+'][y]').value = y; $('newZone[Points]['+index+'][y]').value = y;
zone['Points'][index].x = x; zone['Points'][index].x = x;
zone['Points'][index].y = y; zone['Points'][index].y = y;
var Point = $('zonePoly').points.getItem(index); var Point = $('zonePoly').points.getItem(index);
Point.x =x; Point.x =x;
Point.y =y; Point.y =y;
updateArea(); updateArea();
@ -384,7 +384,7 @@ function delPoint( index )
function limitPointValue( point, loVal, hiVal ) function limitPointValue( point, loVal, hiVal )
{ {
point.value = constrainValue(point.value, loVal, hiVal) point.value = constrainValue(point.value, loVal, hiVal);
} }
function updateArea( ) { function updateArea( ) {
@ -393,7 +393,6 @@ function updateArea( ) {
var form = $('zoneForm'); var form = $('zoneForm');
form.elements['newZone[Area]'].value = area; form.elements['newZone[Area]'].value = area;
if ( form.elements['newZone[Units]'].value == 'Percent' ) { if ( form.elements['newZone[Units]'].value == 'Percent' ) {
form.elements['newZone[TempArea]'].value = Math.round( area/monitorArea*100 ); form.elements['newZone[TempArea]'].value = Math.round( area/monitorArea*100 );
} else if ( form.elements['newZone[Units]'].value == 'Pixels' ) { } else if ( form.elements['newZone[Units]'].value == 'Pixels' ) {
form.elements['newZone[TempArea]'].value = area; form.elements['newZone[TempArea]'].value = area;
@ -411,7 +410,7 @@ function updateX( index )
point.setStyle( 'left', x+'px' ); point.setStyle( 'left', x+'px' );
zone['Points'][index].x = x; zone['Points'][index].x = x;
var Point = $('zonePoly').points.getItem(index); var Point = $('zonePoly').points.getItem(index);
Point.x = x; Point.x = x;
} }
@ -424,7 +423,7 @@ function updateY( index )
point.setStyle( 'top', y+'px' ); point.setStyle( 'top', y+'px' );
zone['Points'][index].y = y; zone['Points'][index].y = y;
var Point = $('zonePoly').points.getItem(index); var Point = $('zonePoly').points.getItem(index);
Point.y = y; Point.y = y;
} }
@ -568,18 +567,18 @@ function getStreamCmdResponse( respObj, respText ) {
streamCmdPlay( false ); streamCmdPlay( false );
} }
} else { } else {
checkStreamForErrors("getStreamCmdResponse",respObj);//log them checkStreamForErrors("getStreamCmdResponse", respObj);//log them
// Try to reload the image stream. // Try to reload the image stream.
var streamImg = document.getElementById('liveStream'); var streamImg = document.getElementById('liveStream');
if ( streamImg ) if ( streamImg )
streamImg.src = streamImg.src.replace(/rand=\d+/i,'rand='+Math.floor((Math.random() * 1000000) )); streamImg.src = streamImg.src.replace(/rand=\d+/i, 'rand='+Math.floor((Math.random() * 1000000) ));
} }
var streamCmdTimeout = statusRefreshTimeout; var streamCmdTimeout = statusRefreshTimeout;
if ( alarmState == STATE_ALARM || alarmState == STATE_ALERT ) if ( alarmState == STATE_ALARM || alarmState == STATE_ALERT )
streamCmdTimeout = streamCmdTimeout/5; streamCmdTimeout = streamCmdTimeout/5;
streamCmdTimer = streamCmdQuery.delay( streamCmdTimeout ); streamCmdTimer = streamCmdQuery.delay( streamCmdTimeout );
} }
var streamPause = false; var streamPause = false;
@ -613,7 +612,7 @@ function streamCmdStop( action ) {
function streamCmdQuery() { function streamCmdQuery() {
streamCmdReq.send( streamCmdParms+"&command="+CMD_QUERY ); streamCmdReq.send( streamCmdParms+"&command="+CMD_QUERY );
} }
var statusCmdParms = "view=request&request=status&entity=monitor&id="+monitorId+"&element[]=Status&element[]=FrameRate"; var statusCmdParms = "view=request&request=status&entity=monitor&id="+monitorId+"&element[]=Status&element[]=FrameRate";
var statusCmdReq = new Request.JSON( { url: monitorUrl+thisUrl, method: 'post', data: statusCmdParms, timeout: AJAX_TIMEOUT, link: 'cancel', onSuccess: getStatusCmdResponse } ); var statusCmdReq = new Request.JSON( { url: monitorUrl+thisUrl, method: 'post', data: statusCmdParms, timeout: AJAX_TIMEOUT, link: 'cancel', onSuccess: getStatusCmdResponse } );
@ -630,13 +629,13 @@ function getStatusCmdResponse( respObj, respText ) {
setAlarmState( respObj.monitor.Status ); setAlarmState( respObj.monitor.Status );
} }
else else
checkStreamForErrors("getStatusCmdResponse",respObj); checkStreamForErrors("getStatusCmdResponse", respObj);
var statusCmdTimeout = statusRefreshTimeout; var statusCmdTimeout = statusRefreshTimeout;
if ( alarmState == STATE_ALARM || alarmState == STATE_ALERT ) if ( alarmState == STATE_ALARM || alarmState == STATE_ALERT )
statusCmdTimeout = statusCmdTimeout/5; statusCmdTimeout = statusCmdTimeout/5;
statusCmdTimer = statusCmdQuery.delay( statusCmdTimeout ); statusCmdTimer = statusCmdQuery.delay( statusCmdTimeout );
} }
function statusCmdQuery() { function statusCmdQuery() {
statusCmdReq.send(); statusCmdReq.send();