From 6437d687721a6e1c03ea1227101cb806fc1dc145 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Sat, 28 Apr 2018 07:09:10 -0400
Subject: make sure video scrubbing inside event list works

---
 www/js/EventCtrl.js               | 15 +++++++++++----
 www/templates/events.html         |  3 ++-
 www/templates/monitors-modal.html |  2 +-
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js
index ebdff76e..5e228077 100644
--- a/www/js/EventCtrl.js
+++ b/www/js/EventCtrl.js
@@ -803,6 +803,13 @@ angular.module('zmApp.controllers')
             }
         }
 
+    $scope.readyToPlay = function(api) {
+        
+        api.mediaElement.attr("playsinline", "");
+
+
+    };
+
     $scope.downloadFileToDevice = function(path, eid)
     {
 
@@ -2457,10 +2464,10 @@ angular.module('zmApp.controllers')
                 var videoURL;
 
                 //if (event.Event.imageMode == 'path')
-                if (1)
-                    videoURL = event.Event.baseURL + "/events/" + event.Event.relativePath + event.Event.DefaultVideo;
-                else
-                    videoURL = event.Event.baseURL + "/index.php?view=view_video&eid=" + event.Event.Id;
+               
+                   /* videoURL = event.Event.baseURL + "/events/" + event.Event.relativePath + event.Event.DefaultVideo;*/
+                   videoURL = event.Event.baseURL + "/index.php?view=view_video&eid=" + event.Event.Id;
+              
 
             //    console.log("************** VIDEO IS " + videoURL);
                 event.Event.video.config = {
diff --git a/www/templates/events.html b/www/templates/events.html
index 8d855e81..711c2633 100644
--- a/www/templates/events.html
+++ b/www/templates/events.html
@@ -217,7 +217,8 @@
                 <br/>
                 <br/>
                 <div class="videogular-container">
-                  <videogular vg-theme="event.Event.video.config.theme" vg-plays-inline="'true'" vg-auto-play="'true'" vg-responsive="true">
+                  <videogular vg-theme="event.Event.video.config.theme" vg-plays-inline="'true'" vg-auto-play="'true'" vg-responsive="true"
+                  vg-player-ready="readyToPlay($API)" >
                     <vg-overlay-play></vg-overlay-play>
                     <vg-controls>
                       <vg-play-pause-button></vg-play-pause-button>
diff --git a/www/templates/monitors-modal.html b/www/templates/monitors-modal.html
index 17a897db..0569841f 100644
--- a/www/templates/monitors-modal.html
+++ b/www/templates/monitors-modal.html
@@ -183,7 +183,7 @@
         </a>
       </li>
 
-      <li ng-if="isToggleListMenu">
+      <li ng-if="isToggleListMenu" ng-style="{'background-color': isCycle?'rgba(69, 170, 242,0.7)':'rgba(108, 122, 137, 0.7)'}" >
         <a href="" ng-click="toggleCycle()">
           <i class="icon  ion-android-bicycle"></i>-{{cycleText}}</a>
       </li>
-- 
cgit v1.2.3