From ca69a79bedb42464af564e25196c85bd6464bf7f Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Thu, 27 Oct 2016 17:05:33 -0400
Subject: [PATCH] fix video.js not being included when we are viewing an event
 without an h264 file, and when buttons do not exist.

---
 web/skins/classic/includes/functions.php |  9 ++++++++-
 web/skins/classic/views/event.php        |  4 ----
 web/skins/classic/views/js/event.js      | 16 ++++++++++++----
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/web/skins/classic/includes/functions.php b/web/skins/classic/includes/functions.php
index b401f0de7..6bcc340c6 100644
--- a/web/skins/classic/includes/functions.php
+++ b/web/skins/classic/includes/functions.php
@@ -95,7 +95,14 @@ var $j = jQuery.noConflict();
 <?php } ?>
 <?php if ( $title == 'Login' && (defined('ZM_OPT_USE_GOOG_RECAPTCHA') && ZM_OPT_USE_GOOG_RECAPTCHA) ) { ?>
   <script src='https://www.google.com/recaptcha/api.js'></script>
-<?php }
+<?php } else if ( $title == 'Event' ) {
+?>
+        <link href="//vjs.zencdn.net/4.11/video-js.css" rel="stylesheet">
+        <script src="//vjs.zencdn.net/4.11/video.js"></script>
+        <script src="./js/videojs.zoomrotate.js"></script>
+        <script src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.10.6/moment.min.js"></script>
+<?php
+    }
     if ( $skinJsPhpFile )
     {
 ?>
diff --git a/web/skins/classic/views/event.php b/web/skins/classic/views/event.php
index 8e247af4e..b10a59d0a 100644
--- a/web/skins/classic/views/event.php
+++ b/web/skins/classic/views/event.php
@@ -153,10 +153,6 @@ if ( $Event->DefaultVideo() ) {
           </video>
         </div>
         <!--script>includeVideoJs();</script-->
-        <link href="//vjs.zencdn.net/4.11/video-js.css" rel="stylesheet">
-        <script src="//vjs.zencdn.net/4.11/video.js"></script>
-        <script src="./js/videojs.zoomrotate.js"></script>
-        <script src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.10.6/moment.min.js"></script>
         <script>
         var LabelFormat = "<?php echo validJsStr($Monitor->LabelFormat())?>";
         var monitorName = "<?php echo validJsStr($Monitor->Name())?>";
diff --git a/web/skins/classic/views/js/event.js b/web/skins/classic/views/js/event.js
index 0bdbe27c6..d6b7004f4 100644
--- a/web/skins/classic/views/js/event.js
+++ b/web/skins/classic/views/js/event.js
@@ -1,3 +1,5 @@
+var vid = null;
+
 function setButtonState( element, butClass )
 {
   if ( element ) {
@@ -214,7 +216,9 @@ function getEventResponse( respObj, respText )
         return;
 
     eventData = respObj.event;
-    if ( !$('eventStills').hasClass( 'hidden' ) && currEventId != eventData.Id )
+    var eventStills = $('eventStills');
+  
+    if ( eventStills && !$('eventStills').hasClass( 'hidden' ) && currEventId != eventData.Id )
         resetEventStills();
     currEventId = eventData.Id;
 
@@ -275,8 +279,10 @@ function getNearEventsResponse( respObj, respText )
     PrevEventDefVideoPath = respObj.nearevents.PrevEventDefVideoPath;
     NextEventDefVideoPath = respObj.nearevents.NextEventDefVideoPath;
 
-    $('prevEventBtn').disabled = !prevEventId;
-    $('nextEventBtn').disabled = !nextEventId;
+    var prevEventBtn = $('prevEventBtn');
+    if ( prevEventBtn ) prevEventBtn.disabled = !prevEventId;
+    var nextEventBtn = $('nextEventBtn');
+    if ( nextEventBtn ) nextEventBtn.disabled = !nextEventId;
 }
 
 var nearEventsReq = new Request.JSON( { url: thisUrl, method: 'get', timeout: AJAX_TIMEOUT, link: 'cancel', onSuccess: getNearEventsResponse } );
@@ -859,7 +865,9 @@ function setupListener()
 
 function initPage() {
   //FIXME prevent blocking...not sure what is happening or best way to unblock
-  vid = videojs("videoobj");
+  if ( $('videoobj') ) {
+    vid = videojs("videoobj");
+  }
   if ( vid ) {
 /*
     setupListener();