From 8f51331472ef3d06a8a22c85077c3eef3fd3bf11 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 7 Apr 2017 13:20:04 -0400
Subject: [PATCH] fix timeline view by using view=image instead of direct path

---
 web/skins/classic/views/js/timeline.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/web/skins/classic/views/js/timeline.js b/web/skins/classic/views/js/timeline.js
index 5b976cca9..260e9ca82 100644
--- a/web/skins/classic/views/js/timeline.js
+++ b/web/skins/classic/views/js/timeline.js
@@ -111,7 +111,7 @@ function previewEvent( eventId, frameId )
             if ( event['frames'][frameId] )
             {
                 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;
                 loadEventImage( imagePath, eventId, frameId, event.Width, event.Height, event.Frames/event.Length, videoName, event.Length, event.StartTime, monitors[event.MonitorId]);
                 return;
@@ -125,11 +125,10 @@ function loadEventImage( imagePath, eid, fid, width, height, fps, videoName, dur
 {
     var vid= $('preview');
     var imageSrc = $('imageSrc');
-    if(videoName)
-    {
+    if ( videoName && vid ) {
         vid.show();
         imageSrc.hide();
-        var newsource=imagePrefix+imagePath.slice(0,imagePath.lastIndexOf('/'))+"/"+videoName;
+        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)
@@ -154,9 +153,9 @@ function loadEventImage( imagePath, eid, fid, width, height, fps, videoName, dur
     }
     else
     {
-        vid.hide();
+        if ( vid ) vid.hide();
         imageSrc.show();
-        imageSrc.setProperty( 'src', imagePrefix+imagePath );
+        imageSrc.setProperty( 'src', imagePath );
         imageSrc.removeEvent( 'click' );
         imageSrc.addEvent( 'click', showEvent.pass( [ eid, fid, width, height ] ) );
     }