summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArjun Roychowdhury <pliablepixels@gmail.com>2015-12-14 16:53:50 -0500
committerArjun Roychowdhury <pliablepixels@gmail.com>2015-12-14 16:53:50 -0500
commitb6ad3e2e3f35bb85594d14292c3935bf5592fa1e (patch)
treecd67e56d45019a48bef6160c91a57348f46a0a18
parent5030376f650715c255047b004f35d62511b516e5 (diff)
moda
Former-commit-id: 4430445a8332c7f9390b9cb8fcec7f9a93fcc232
-rw-r--r--www/js/TimelineCtrl.js7
1 files changed, 7 insertions, 0 deletions
diff --git a/www/js/TimelineCtrl.js b/www/js/TimelineCtrl.js
index 34978293..74f3ab93 100644
--- a/www/js/TimelineCtrl.js
+++ b/www/js/TimelineCtrl.js
@@ -119,6 +119,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
// pass this event to ModalCtrl
$scope.currentEvent = event;
+ $scope.event = event;
// in Timeline view, make sure events stick to same monitor
$scope.followSameMonitor="1";
@@ -266,6 +267,12 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
// Controller main
//-------------------------------------------------
+ $scope.mycarousel = {
+ index: 0
+ };
+ $scope.ionRange = {
+ index: 1
+ };
//var currentEvent="";
// keep a record for redraw