From e1afdd098de4c002c73019b79bd301271f8efc4f Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Mon, 25 Dec 2017 09:07:18 -0500
Subject: fixed timeline click not working and also fixed toggle menu state
 display

---
 www/js/TimelineCtrl.js              | 6 ++++--
 www/templates/timeline-popover.html | 3 +++
 www/templates/timeline.html         | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/www/js/TimelineCtrl.js b/www/js/TimelineCtrl.js
index 58c58a62..b85040d1 100644
--- a/www/js/TimelineCtrl.js
+++ b/www/js/TimelineCtrl.js
@@ -87,6 +87,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
         ld.enableAlarmCount = !ld.enableAlarmCount;
 
         NVRDataModel.setLogin(ld);
+        $scope.loginData = ld;
 
         drawGraph(curFromDate, curToDate, curCount);
 
@@ -1329,6 +1330,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
 
                             timeline.on('click', function(prop)
                             {
+                                console.log ("CLICK");
 
                                 $timeout(function()
                                 {
@@ -1412,7 +1414,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
 
                             timeline.on('doubleClick', function(prop)
                             {
-                                //console.log ("DOUBLE");
+                                console.log ("DOUBLE");
                                 dblclick = true;
                                 var itm = prop.item;
                                 //console.log ("ITEM CLICKED " + itm);
@@ -1465,7 +1467,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
                                     // console.log("Zoomed out too far to playback events");
                                 }
 
-                            });
+                            }); 
                         },
                         function(error)
                         {
diff --git a/www/templates/timeline-popover.html b/www/templates/timeline-popover.html
index beeb482d..373ea09e 100644
--- a/www/templates/timeline-popover.html
+++ b/www/templates/timeline-popover.html
@@ -1,6 +1,9 @@
 <ion-popover-view class="fit">
     <ion-content>
+
         <div class="list" ng-click="popover.hide()">
+  
+
             <a class="item" ng-href="" ng-click="popover.hide();toggleMinAlarmFrameCount();" ng-if="loginData.enableAlarmCount">{{'kShowAllEvents' | translate}}</a>
             <a class="item" ng-href="" ng-click="popover.hide();toggleMinAlarmFrameCount();" ng-if="!loginData.enableAlarmCount"> {{'kShowAlarmedEvents' | translate}}</a>
             <a class="item" ng-href="" ng-click="popover.hide();buttonClicked(0);">{{'kMonth' | translate}}</a>
diff --git a/www/templates/timeline.html b/www/templates/timeline.html
index eb15aca3..28bd3904 100644
--- a/www/templates/timeline.html
+++ b/www/templates/timeline.html
@@ -32,7 +32,7 @@
         </center>
       </div>
       <div style="padding-left:15px; padding-right:15px;">
-        <div id="visualization">
+        <div id="visualization" data-tap-disabled="true">
         </div>
       </div>
       <br/>
-- 
cgit v1.2.3