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

simplify some code, pass around zm_event json objects instead of event_id. Each monitor has it's own image so when loading event data put it into a div/img referenced by monitor Id

This commit is contained in:
Isaac Connor 2020-01-05 17:32:27 -05:00
parent 377805dce0
commit 2854f8e002
1 changed files with 26 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,12 +36,6 @@ function createEventHtml(zm_event, frame) {
return eventHtml; return eventHtml;
} }
function showEventDetail( eventHtml ) {
$('instruction').addClass( 'hidden' );
$('eventData').empty();
$('eventData').adopt( eventHtml );
$('eventData').removeClass( 'hidden' );
}
function eventDataResponse( respObj, respText ) { function eventDataResponse( respObj, respText ) {
var zm_event = respObj.event; var zm_event = respObj.event;
@ -79,18 +73,20 @@ function frameDataResponse( respObj, respText ) {
zm_event['frames'][frame.FrameId] = frame; zm_event['frames'][frame.FrameId] = frame;
zm_event['frames'][frame.FrameId]['html'] = createEventHtml( zm_event, frame ); zm_event['frames'][frame.FrameId]['html'] = createEventHtml( zm_event, frame );
showEventData(frame.EventId, frame.FrameId); showEventData(zm_event, frame.FrameId);
} }
function showEventData(eventId, frameId) { function showEventData(zm_event, frameId) {
if ( events[eventId] ) { if ( zm_event ) {
var zm_event = events[eventId];
if ( zm_event['frames'] ) { if ( zm_event['frames'] ) {
if ( zm_event['frames'][frameId] ) { if ( zm_event['frames'][frameId] ) {
showEventDetail( zm_event['frames'][frameId]['html'] ); $('instruction').addClass('hidden');
eventData = $('eventData'+zm_event.MonitorId);
eventData.empty();
eventData.adopt(zm_event['frames'][frameId]['html']);
eventData.removeClass('hidden');
var imagePath = 'index.php?view=image&eid='+eventId+'&fid='+frameId; var imagePath = 'index.php?view=image&eid='+eventId+'&fid='+frameId;
var videoName = zm_event.DefaultVideo; loadEventImage(imagePath, zm_event, frameId);
loadEventImage( imagePath, eventId, frameId, zm_event.Width, zm_event.Height, zm_event.Frames/zm_event.Length, videoName, zm_event.Length, zm_event.StartTime, monitors[zm_event.MonitorId]);
return; return;
} else { } else {
console.log('No frames for ' + frameId); console.log('No frames for ' + frameId);
@ -99,7 +95,7 @@ function showEventData(eventId, frameId) {
console.log('No frames'); console.log('No frames');
} }
} else { } else {
console.log('No event for ' + eventId); console.log('No event');
} }
} }
@ -133,50 +129,28 @@ function previewEvent(slot) {
eventId = slot.getAttribute('data-event-id'); eventId = slot.getAttribute('data-event-id');
frameId = slot.getAttribute('data-frame-id'); frameId = slot.getAttribute('data-frame-id');
if ( events[eventId] ) { if ( events[eventId] ) {
showEventData(eventId, frameId); showEventData(events[eventId], frameId);
} else { } else {
requestFrameData(eventId, frameId); requestFrameData(eventId, frameId);
} }
} }
function loadEventImage( imagePath, eid, fid, width, height, fps, videoName, duration, startTime, Monitor ) { function loadEventImage( imagePath, zm_event, fid ) {
var vid = $('preview'); var imageSrc = $('imageSrc'+zm_event.MonitorId);
var imageSrc = $('imageSrc');
if ( videoName && vid ) {
vid.show();
imageSrc.hide();
var newsource=imagePath.slice(0, imagePath.lastIndexOf('/'))+'/'+videoName;
//console.log(newsource);
//console.log(sources[0].src.slice(-newsource.length));
if ( newsource != vid.currentSrc.slice(-newsource.length) || vid.readyState == 0 ) {
//console.log("loading new");
//it is possible to set a long source list here will that be unworkable?
var sources = vid.getElementsByTagName('source');
sources[0].src = newsource;
var tracks = vid.getElementsByTagName('track');
if (tracks.length) {
tracks[0].parentNode.removeChild(tracks[0]);
}
vid.load();
addVideoTimingTrack(vid, Monitor.LabelFormat, Monitor.Name, duration, startTime);
vid.currentTime = fid/fps;
} else {
if ( ! vid.seeking ) {
vid.currentTime=fid/fps;
}
}
} else {
if ( vid ) vid.hide();
imageSrc.show(); imageSrc.show();
imageSrc.setProperty('src', imagePath); imageSrc.setProperty('src', imagePath);
imageSrc.setAttribute('data-event-id', eid); imageSrc.setAttribute('data-event-id', zm_event.Id);
imageSrc.setAttribute('data-frame-id', fid); imageSrc.setAttribute('data-frame-id', fid);
imageSrc.onclick=window['showEvent'].bind(imageSrc, imageSrc); imageSrc.onclick=window['showEvent'].bind(imageSrc, imageSrc);
}
var eventData = $('eventData'); var eventData = $('eventData'.zm_event.MonitorId);
if ( eventData ) {
eventData.removeEvent('click'); eventData.removeEvent('click');
eventData.addEvent('click', showEvent.pass()); eventData.addEvent('click', showEvent.pass());
} else {
console.log("No eventdata area found for monitor " + zm_event.MonitorId);
}
} }
function tlZoomBounds( minTime, maxTime ) { function tlZoomBounds( minTime, maxTime ) {
@ -204,4 +178,3 @@ window.addEventListener("DOMContentLoaded", function() {
el.onmouseover = window[el.getAttribute('data-on-mouseover-this')].bind(el, el); el.onmouseover = window[el.getAttribute('data-on-mouseover-this')].bind(el, el);
}); });
}); });