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

Handle errors returned from Ajax more gracefully. 

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2709 e3e1d417-86f3-4887-817a-d78f3d33393f
This commit is contained in:
viseon 2008-12-05 23:58:58 +00:00
parent f2ad7cc770
commit 2419b6582e
1 changed files with 165 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -102,100 +102,104 @@ function getStreamCmdResponse( respText )
if ( !respText ) if ( !respText )
return; return;
var response = Json.evaluate( respText ); var response = Json.evaluate( respText );
streamStatus = response.status;
$('fpsValue').setText( streamStatus.fps );
setAlarmState( streamStatus.state ); if ( response.result == 'Ok' )
$('levelValue').setText( streamStatus.level );
if ( streamStatus.level > 95 )
$('levelValue').className = "alarm";
else if ( streamStatus.level > 80 )
$('levelValue').className = "alert";
else
$('levelValue').className = "ok";
var delayString = secsToTime( streamStatus.delay );
if ( streamStatus.paused == true )
{ {
$('modeValue').setText( "Paused" ); streamStatus = response.status;
$('rate').addClass( 'hidden' ); $('fpsValue').setText( streamStatus.fps );
$('delayValue').setText( delayString );
$('delay').removeClass( 'hidden' ); setAlarmState( streamStatus.state );
$('level').removeClass( 'hidden' );
streamCmdPause( false ); $('levelValue').setText( streamStatus.level );
} if ( streamStatus.level > 95 )
else if ( streamStatus.delayed == true ) $('levelValue').className = "alarm";
{ else if ( streamStatus.level > 80 )
$('modeValue').setText( "Replay" ); $('levelValue').className = "alert";
$('rateValue').setText( streamStatus.rate ); else
$('rate').removeClass( 'hidden' ); $('levelValue').className = "ok";
$('delayValue').setText( delayString );
$('delay').removeClass( 'hidden' ); var delayString = secsToTime( streamStatus.delay );
$('level').removeClass( 'hidden' );
if ( streamStatus.rate == 1 ) if ( streamStatus.paused == true )
{ {
$('modeValue').setText( "Paused" );
$('rate').addClass( 'hidden' );
$('delayValue').setText( delayString );
$('delay').removeClass( 'hidden' );
$('level').removeClass( 'hidden' );
streamCmdPause( false );
}
else if ( streamStatus.delayed == true )
{
$('modeValue').setText( "Replay" );
$('rateValue').setText( streamStatus.rate );
$('rate').removeClass( 'hidden' );
$('delayValue').setText( delayString );
$('delay').removeClass( 'hidden' );
$('level').removeClass( 'hidden' );
if ( streamStatus.rate == 1 )
{
streamCmdPlay( false );
}
else if ( streamStatus.rate > 0 )
{
if ( streamStatus.rate < 1 )
streamCmdSlowFwd( false );
else
streamCmdFastFwd( false );
}
else
{
if ( streamStatus.rate > -1 )
streamCmdSlowRev( false );
else
streamCmdFastRev( false );
}
}
else
{
$('modeValue').setText( "Live" );
$('rate').addClass( 'hidden' );
$('delay').addClass( 'hidden' );
$('level').addClass( 'hidden' );
streamCmdPlay( false ); streamCmdPlay( false );
} }
else if ( streamStatus.rate > 0 ) $('zoomValue').setText( streamStatus.zoom );
{ if ( streamStatus.zoom == "1.0" )
if ( streamStatus.rate < 1 ) setButtonState( $('zoomOutBtn'), 'unavail' );
streamCmdSlowFwd( false );
else
streamCmdFastFwd( false );
}
else else
{ setButtonState( $('zoomOutBtn'), 'inactive' );
if ( streamStatus.rate > -1 )
streamCmdSlowRev( false );
else
streamCmdFastRev( false );
}
}
else
{
$('modeValue').setText( "Live" );
$('rate').addClass( 'hidden' );
$('delay').addClass( 'hidden' );
$('level').addClass( 'hidden' );
streamCmdPlay( false );
}
$('zoomValue').setText( streamStatus.zoom );
if ( streamStatus.zoom == "1.0" )
setButtonState( $('zoomOutBtn'), 'unavail' );
else
setButtonState( $('zoomOutBtn'), 'inactive' );
if ( canEditMonitors ) if ( canEditMonitors )
{
if ( streamStatus.enabled )
{ {
$('enableAlarmsLink').addClass( 'hidden' ); if ( streamStatus.enabled )
$('disableAlarmsLink').removeClass( 'hidden' );
if ( streamStatus.forced )
{ {
$('forceAlarmLink').addClass( 'hidden' ); $('enableAlarmsLink').addClass( 'hidden' );
$('cancelAlarmLink').removeClass( 'hidden' ); $('disableAlarmsLink').removeClass( 'hidden' );
if ( streamStatus.forced )
{
$('forceAlarmLink').addClass( 'hidden' );
$('cancelAlarmLink').removeClass( 'hidden' );
}
else
{
$('forceAlarmLink').removeClass( 'hidden' );
$('cancelAlarmLink').addClass( 'hidden' );
}
$('forceCancelAlarm').removeClass( 'hidden' );
} }
else else
{ {
$('forceAlarmLink').removeClass( 'hidden' ); $('enableAlarmsLink').removeClass( 'hidden' );
$('cancelAlarmLink').addClass( 'hidden' ); $('disableAlarmsLink').addClass( 'hidden' );
$('forceCancelAlarm').addClass( 'hidden' );
} }
$('forceCancelAlarm').removeClass( 'hidden' ); $('enableDisableAlarms').removeClass( 'hidden' );
} }
else else
{ {
$('enableAlarmsLink').removeClass( 'hidden' ); $('enableDisableAlarms').addClass( 'hidden' );
$('disableAlarmsLink').addClass( 'hidden' );
$('forceCancelAlarm').addClass( 'hidden' );
} }
$('enableDisableAlarms').removeClass( 'hidden' );
}
else
{
$('enableDisableAlarms').addClass( 'hidden' );
} }
var streamCmdTimeout = statusRefreshTimeout; var streamCmdTimeout = statusRefreshTimeout;
@ -349,9 +353,12 @@ function getStatusCmdResponse( respText )
if ( !respText ) if ( !respText )
return; return;
var response = Json.evaluate( respText ); var response = Json.evaluate( respText );
$('fpsValue').setText( response.monitor.FrameRate );
if ( response.result == 'Ok' )
setAlarmState( response.monitor.Status ); {
$('fpsValue').setText( response.monitor.FrameRate );
setAlarmState( response.monitor.Status );
}
var statusCmdTimeout = statusRefreshTimeout; var statusCmdTimeout = statusRefreshTimeout;
if ( alarmState == STATE_ALARM || alarmState == STATE_ALERT ) if ( alarmState == STATE_ALARM || alarmState == STATE_ALERT )
@ -401,9 +408,12 @@ function getActResponse( respText )
return; return;
var response = Json.evaluate( respText ); var response = Json.evaluate( respText );
if ( response.refreshParent ) if ( response.result == 'Ok' )
{ {
window.opener.location.reload(); if ( response.refreshParent )
{
window.opener.location.reload();
}
} }
eventCmdQuery(); eventCmdQuery();
} }
@ -435,89 +445,93 @@ function getEventCmdResponse( respText )
return; return;
var response = Json.evaluate( respText ); var response = Json.evaluate( respText );
var dbEvents = response.events.reverse(); if ( response.result == 'Ok' )
var eventList = $('eventList');
var eventListBody = $(eventList).getElement( 'tbody' );
var eventListRows = $(eventListBody).getElements( 'tr' );
eventListRows.each( function( row ) { row.removeClass( 'updated' ); } );
for ( var i = 0; i < dbEvents.length; i++ )
{ {
var event = dbEvents[i]; var dbEvents = response.events.reverse();
var row = $('event'+event.Id); var eventList = $('eventList');
var newEvent = (row == null ? true : false); var eventListBody = $(eventList).getElement( 'tbody' );
if ( newEvent ) var eventListRows = $(eventListBody).getElements( 'tr' );
eventListRows.each( function( row ) { row.removeClass( 'updated' ); } );
for ( var i = 0; i < dbEvents.length; i++ )
{ {
row = new Element( 'tr', { 'id': 'event'+event.Id } ); var event = dbEvents[i];
new Element( 'td', { 'class': 'colId' } ).injectInside( row ); var row = $('event'+event.Id);
new Element( 'td', { 'class': 'colName' } ).injectInside( row ); var newEvent = (row == null ? true : false);
new Element( 'td', { 'class': 'colTime' } ).injectInside( row ); if ( newEvent )
new Element( 'td', { 'class': 'colSecs' } ).injectInside( row ); {
new Element( 'td', { 'class': 'colFrames' } ).injectInside( row ); row = new Element( 'tr', { 'id': 'event'+event.Id } );
new Element( 'td', { 'class': 'colScore' } ).injectInside( row ); new Element( 'td', { 'class': 'colId' } ).injectInside( row );
new Element( 'td', { 'class': 'colDelete' } ).injectInside( row ); new Element( 'td', { 'class': 'colName' } ).injectInside( row );
new Element( 'td', { 'class': 'colTime' } ).injectInside( row );
new Element( 'td', { 'class': 'colSecs' } ).injectInside( row );
new Element( 'td', { 'class': 'colFrames' } ).injectInside( row );
new Element( 'td', { 'class': 'colScore' } ).injectInside( row );
new Element( 'td', { 'class': 'colDelete' } ).injectInside( row );
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.setText( event.Id ); link.setText( event.Id );
link.injectInside( row.getElement( 'td.colId' ) ); link.injectInside( 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.setText( event.Name ); link.setText( event.Name );
link.injectInside( row.getElement( 'td.colName' ) ); link.injectInside( row.getElement( 'td.colName' ) );
row.getElement( 'td.colTime' ).setText( event.StartTime ); row.getElement( 'td.colTime' ).setText( event.StartTime );
row.getElement( 'td.colSecs' ).setText( event.Length ); row.getElement( 'td.colSecs' ).setText( 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.setText( event.Frames+'/'+event.AlarmFrames ); link.setText( event.Frames+'/'+event.AlarmFrames );
link.injectInside( row.getElement( 'td.colFrames' ) ); link.injectInside( 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.setText( event.AvgScore+'/'+event.MaxScore ); link.setText( event.AvgScore+'/'+event.MaxScore );
link.injectInside( row.getElement( 'td.colScore' ) ); link.injectInside( row.getElement( 'td.colScore' ) );
link = new Element( 'a', { 'href': '#', 'title': deleteString, 'events': { 'click': deleteEvent.bindWithEvent( link, event.Id ), 'mouseover': highlightRow.pass( row ), 'mouseout': highlightRow.pass( row ) } }); link = new Element( 'a', { 'href': '#', 'title': deleteString, 'events': { 'click': deleteEvent.bindWithEvent( link, event.Id ), 'mouseover': highlightRow.pass( row ), 'mouseout': highlightRow.pass( row ) } });
link.setText( 'X' ); link.setText( 'X' );
link.injectInside( row.getElement( 'td.colDelete' ) ); link.injectInside( row.getElement( 'td.colDelete' ) );
if ( i == 0 ) if ( i == 0 )
row.injectInside( $(eventListBody) ); row.injectInside( $(eventListBody) );
else
{
row.injectTop( $(eventListBody) );
if ( !eventCmdFirst )
row.addClass( 'recent' );
}
}
else else
{ {
row.injectTop( $(eventListBody) ); row.getElement( 'td.colName a' ).setText( event.Name );
if ( !eventCmdFirst ) row.getElement( 'td.colSecs' ).setText( event.Length );
row.addClass( 'recent' ); row.getElement( 'td.colFrames a' ).setText( event.Frames+'/'+event.AlarmFrames );
row.getElement( 'td.colScore a' ).setText( event.AvgScore+'/'+event.MaxScore );
row.removeClass( 'recent' );
}
row.addClass( 'updated' );
}
var rows = $(eventListBody).getElements( 'tr' );
for ( var i = 0; i < rows.length; i++ )
{
if ( !rows[i].hasClass( 'updated' ) )
{
rows[i].remove();
rows.splice( i, 1 );
i--;
} }
} }
else while ( rows.length > maxDisplayEvents )
{ {
row.getElement( 'td.colName a' ).setText( event.Name ); rows[rows.length-1].remove();
row.getElement( 'td.colSecs' ).setText( event.Length ); rows.length--;
row.getElement( 'td.colFrames a' ).setText( event.Frames+'/'+event.AlarmFrames );
row.getElement( 'td.colScore a' ).setText( event.AvgScore+'/'+event.MaxScore );
row.removeClass( 'recent' );
} }
row.addClass( 'updated' );
} }
var rows = $(eventListBody).getElements( 'tr' );
for ( var i = 0; i < rows.length; i++ )
{
if ( !rows[i].hasClass( 'updated' ) )
{
rows[i].remove();
rows.splice( i, 1 );
i--;
}
}
while ( rows.length > maxDisplayEvents )
{
rows[rows.length-1].remove();
rows.length--;
}
var eventCmdTimeout = eventsRefreshTimeout; var eventCmdTimeout = eventsRefreshTimeout;
if ( alarmState == STATE_ALARM || alarmState == STATE_ALERT ) if ( alarmState == STATE_ALARM || alarmState == STATE_ALERT )
eventCmdTimeout = eventCmdTimeout/5; eventCmdTimeout = eventCmdTimeout/5;
@ -539,8 +553,7 @@ function getControlResponse( respText )
return; return;
//console.log( respText ); //console.log( respText );
var response = Json.evaluate( respText ); var response = Json.evaluate( respText );
result = response.result; if ( response.result != 'Ok' )
if ( result != 'Ok' )
{ {
alert( "Control response was status = "+response.status+"\nmessage = "+response.message ); alert( "Control response was status = "+response.status+"\nmessage = "+response.message );
} }
@ -627,11 +640,11 @@ function handleClick( event )
function initPage() function initPage()
{ {
if ( streamMode == "single" ) if ( streamMode == "single" )
statusCmdTimer = statusCmdQuery.delay( 1000 ); statusCmdTimer = statusCmdQuery.delay( (Math.random()+0.5)*statusRefreshTimeout );
else else
streamCmdTimer = streamCmdQuery.delay( 1000 ); streamCmdTimer = streamCmdQuery.delay( (Math.random()+0.5)*statusRefreshTimeout );
eventCmdTimer = eventCmdQuery.delay( 1500 ); eventCmdTimer = eventCmdQuery.delay( (Math.random()+0.5)*eventsRefreshTimeout );
if ( canStreamNative || streamMode == "single" ) if ( canStreamNative || streamMode == "single" )
{ {