#801 final cleanups, some test aut stuff too

1 files changed, 21 insertions, 2 deletions

diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js
index a7ba3128..15ae11df 100644
--- a/www/js/EventCtrl.js
+++ b/www/js/EventCtrl.js
@@ -67,6 +67,9 @@ angular.module('zmApp.controllers')
     var eventsListScrubHeight = eventsListScrubHeight;
     var eventsListDetailsHeight = eventsListDetailsHeight;
 
+    var eHandle;
+    var scrubOngoing = false;
+
 
     //---------------------------------------------------
     // initial code
@@ -149,6 +152,9 @@ angular.module('zmApp.controllers')
       else if ($scope.modal != undefined && $scope.modal.isShown()) {
           NVR.debug ("Not reloading as you have a modal open");
       }
+      else if (scrubOngoing) {
+          NVR.debug ("Not reloading, as video scrub is on");
+      }
       else {
         doRefresh();
       }
@@ -825,11 +831,18 @@ angular.module('zmApp.controllers')
 
     $scope.readyToPlay = function (api) {
 
-      api.mediaElement.attr("playsinline", "");
+      eHandle = api;
+      eHandle.mediaElement.attr("playsinline", "");
 
 
     };
 
+    $scope.eventCanPlay = function() {
+        NVR.debug("This video can be played");
+        eHandle.play();
+
+    };
+
 
     $scope.downloadFileToDevice = function (path, eid) {
 
@@ -2109,6 +2122,11 @@ angular.module('zmApp.controllers')
         scrollbynumber = 0;
       }
 
+      if (scrubOngoing) { 
+          NVR.debug ("making sure scrub is off");
+          scrubOngoing = false;
+      }
+
       if (oldEvent && event != oldEvent) {
 
         NVR.debug("EventCtrl:Old event scrub will hide now");
@@ -2207,6 +2225,7 @@ angular.module('zmApp.controllers')
         {
 
           NVR.debug("EventCtrl: Scrubbing will turn on now");
+          scrubOngoing = true;
           $scope.currentEvent = "";
           $scope.event = event;
           //$ionicScrollDelegate.freezeScroll(true);
@@ -2313,7 +2332,7 @@ angular.module('zmApp.controllers')
 
             ],
 
-            theme: "lib/videogular-themes-default/videogular.css",
+            theme: "external/videogular2.2.1/videogular.min.css",
 
           };