diff options
Diffstat (limited to 'www')
| -rw-r--r-- | www/js/EventCtrl.js | 12 | ||||
| -rw-r--r-- | www/js/TimelineCtrl.js | 15 |
2 files changed, 15 insertions, 12 deletions
diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js index 65190edc..d0f42975 100644 --- a/www/js/EventCtrl.js +++ b/www/js/EventCtrl.js @@ -79,12 +79,7 @@ angular.module('zmApp.controllers') $scope.connKey = Math.floor(Math.random() * (999999 - 111111 + 1)) + 111111; - $ionicPopover.fromTemplateUrl('templates/events-popover.html', { - scope: $scope, - }).then(function (popover) { - $scope.popover = popover; - }); - + // These are the commands ZM uses to move around // in ZMS - not used anymore as I am doing direct // image access via image.php @@ -882,6 +877,11 @@ angular.module('zmApp.controllers') badge: 0, }); + $ionicPopover.fromTemplateUrl('templates/events-popover.html', { + scope: $scope, + }).then(function (popover) { + $scope.popover = popover; + }); //reset badge count if (window.cordova && window.cordova.plugins.notification) { diff --git a/www/js/TimelineCtrl.js b/www/js/TimelineCtrl.js index b5dc5711..34978293 100644 --- a/www/js/TimelineCtrl.js +++ b/www/js/TimelineCtrl.js @@ -252,6 +252,14 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla { drawGraph(fromDate, toDate, maxItems); } + + $ionicPopover.fromTemplateUrl('templates/timeline-popover.html', { + scope: $scope, + }).then(function (popover) { + $scope.popover = popover; + }); + + }); //------------------------------------------------- @@ -321,12 +329,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla $scope.navControls = false; var navControls = false; - $ionicPopover.fromTemplateUrl('templates/timeline-popover.html', { - scope: $scope, - }).then(function (popover) { - $scope.popover = popover; - }); - + //drawGraph(fromDate, toDate, maxItems); //dummyDrawGraph(fromDate, toDate,maxItems); |