diff options
| author | pliablepixels <pliablepixels@gmail.com> | 2016-03-22 12:47:30 -0400 |
|---|---|---|
| committer | pliablepixels <pliablepixels@gmail.com> | 2016-03-22 12:47:30 -0400 |
| commit | ef13d9e54b1753178415ddf371b4b5efbc3fd8e3 (patch) | |
| tree | 087f31adaf82c386a9f73499fe34037b189cb1b1 /www/js/TimelineCtrl.js | |
| parent | dcd2fde3fbeda349f0463cf68e02c1eaea9a58f0 (diff) | |
#206 initial code
Former-commit-id: 78bafe5376d095c89e4ddf1c7c010f156708c49e
Diffstat (limited to 'www/js/TimelineCtrl.js')
| -rw-r--r-- | www/js/TimelineCtrl.js | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/www/js/TimelineCtrl.js b/www/js/TimelineCtrl.js index 6ba9b05e..1a075da1 100644 --- a/www/js/TimelineCtrl.js +++ b/www/js/TimelineCtrl.js @@ -587,10 +587,11 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla if (idfound) { if (typeof myevents[i].Event.DefaultVideo === 'undefined') + console.log (JSON.stringify(myevents[i])); myevents[i].Event.DefaultVideo = ""; graphData.add({ id: graphIndex, - content: "<span class='my-vis-font'>" + myevents[i].Event.Notes + "</span>", + content: "<span class='my-vis-font'>" + "( <i class='ion-android-notifications'></i>"+myevents[i].Event.AlarmFrames+") "+myevents[i].Event.Notes + "</span>", start: myevents[i].Event.StartTime, end: myevents[i].Event.EndTime, group: myevents[i].Event.MonitorId, @@ -633,7 +634,12 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla $scope.graphLoaded = true; ZMDataModel.zmDebug("graph loaded: " + $scope.graphLoaded); $scope.navControls = false; + + + timeline.on('select', function (properties) { + //console.log ("CLICK"); + // console.log ("EVENT IS " + JSON.stringify(properties.event)); if (properties.items && !isNaN(properties.items[0])) { ZMDataModel.zmDebug("TimelineCtrl/drawGraph:You clicked on item " + properties.items); var item = graphData.get(properties.items); @@ -654,6 +660,10 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla } }); + + timeline.on ('doubleClick', function (p) { + console.log ("DOUBLE"); + }); }, function (error) { ZMDataModel.displayBanner('error', 'Timeline error', 'Please try again'); |