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

initialAlarmcues arguements 

initialAlarmcues now takes an eventId arg.  Needed to reload when zms streams switch since they don't reload the page
This commit is contained in:
digital-gnome 2017-10-11 20:57:13 -04:00
parent 99dd469a1c
commit b9f9dd721b
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,8 +44,8 @@ $j.ajaxSetup ({timeout: AJAX_TIMEOUT }); //sets timeout for all getJSON.
var cueFrames = null; //make cueFrames availaible even if we don't send another ajax query var cueFrames = null; //make cueFrames availaible even if we don't send another ajax query
function initialAlarmCues () { function initialAlarmCues (eventId) {
$j.getJSON("api/events/"+eventData.Id+".json", setAlarmCues); //get frames data for alarmCues and inserts into html $j.getJSON("api/events/"+eventId+".json", setAlarmCues); //get frames data for alarmCues and inserts into html
} }
function setAlarmCues (data) { function setAlarmCues (data) {
@ -183,6 +183,7 @@ function getCmdResponse( respObj, respText ) {
var eventId = streamStatus.event; var eventId = streamStatus.event;
if ( eventId != lastEventId ) { if ( eventId != lastEventId ) {
eventQuery( eventId ); eventQuery( eventId );
initialAlarmCues(eventId); //zms uses this instead of a page reload, must call ajax+render
lastEventId = eventId; lastEventId = eventId;
} }
if ( streamStatus.paused == true ) { if ( streamStatus.paused == true ) {
@ -936,7 +937,7 @@ function initPage() {
//FIXME prevent blocking...not sure what is happening or best way to unblock //FIXME prevent blocking...not sure what is happening or best way to unblock
if ( $('videoobj') ) { if ( $('videoobj') ) {
vid = videojs("videoobj"); vid = videojs("videoobj");
initialAlarmCues(); //call ajax+renderAlarmCues after videojs is. should be only call to initialAlarmCues initialAlarmCues(eventData.Id); //call ajax+renderAlarmCues after videojs is. should be only call to initialAlarmCues on vjs streams
} }
if ( vid ) { if ( vid ) {
/* /*
@ -959,7 +960,7 @@ function initPage() {
} else { } else {
streamCmdTimer = streamQuery.delay( 250 ); streamCmdTimer = streamQuery.delay( 250 );
eventQuery.pass( eventData.Id ).delay( 500 ); eventQuery.pass( eventData.Id ).delay( 500 );
initialAlarmCues(); //call ajax+renderAlarmCues for nph-zms. should be only call to initialAlarmCues initialAlarmCues(eventData.Id); //call ajax+renderAlarmCues for nph-zms.
if ( canStreamNative ) { if ( canStreamNative ) {
var streamImg = $('imageFeed').getElement('img'); var streamImg = $('imageFeed').getElement('img');