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

fix timeline view by using view=image instead of direct path

This commit is contained in:
Isaac Connor 2017-04-07 13:20:04 -04:00
parent 94ddfc4053
commit 8f51331472
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -111,7 +111,7 @@ function previewEvent( eventId, frameId )
if ( event['frames'][frameId] ) if ( event['frames'][frameId] )
{ {
showEventDetail( event['frames'][frameId]['html'] ); showEventDetail( event['frames'][frameId]['html'] );
var imagePath = event.frames[frameId].Image.imagePath; var imagePath = '/index.php?view=image&eid='+eventId+'&fid='+frameId;
var videoName = event.DefaultVideo; var videoName = event.DefaultVideo;
loadEventImage( imagePath, eventId, frameId, event.Width, event.Height, event.Frames/event.Length, videoName, event.Length, event.StartTime, monitors[event.MonitorId]); loadEventImage( imagePath, eventId, frameId, event.Width, event.Height, event.Frames/event.Length, videoName, event.Length, event.StartTime, monitors[event.MonitorId]);
return; return;
@ -125,11 +125,10 @@ function loadEventImage( imagePath, eid, fid, width, height, fps, videoName, dur
{ {
var vid= $('preview'); var vid= $('preview');
var imageSrc = $('imageSrc'); var imageSrc = $('imageSrc');
if(videoName) if ( videoName && vid ) {
{
vid.show(); vid.show();
imageSrc.hide(); imageSrc.hide();
var newsource=imagePrefix+imagePath.slice(0,imagePath.lastIndexOf('/'))+"/"+videoName; var newsource=imagePath.slice(0,imagePath.lastIndexOf('/'))+"/"+videoName;
//console.log(newsource); //console.log(newsource);
//console.log(sources[0].src.slice(-newsource.length)); //console.log(sources[0].src.slice(-newsource.length));
if(newsource!=vid.currentSrc.slice(-newsource.length) || vid.readyState==0) if(newsource!=vid.currentSrc.slice(-newsource.length) || vid.readyState==0)
@ -154,9 +153,9 @@ function loadEventImage( imagePath, eid, fid, width, height, fps, videoName, dur
} }
else else
{ {
vid.hide(); if ( vid ) vid.hide();
imageSrc.show(); imageSrc.show();
imageSrc.setProperty( 'src', imagePrefix+imagePath ); imageSrc.setProperty( 'src', 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 ] ) );
} }