From c6c2ef5af33ead04ed143eac9bbdaf8ee528f6cc Mon Sep 17 00:00:00 2001 From: pliablepixels Date: Sun, 3 Apr 2016 17:16:45 -0400 Subject: timeline canDragContent(false) moved to view enter Former-commit-id: a8d18a96e93d646479813a674e59881025921f19 --- www/js/TimelineCtrl.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'www/js') diff --git a/www/js/TimelineCtrl.js b/www/js/TimelineCtrl.js index 1a2814e7..c3c05688 100644 --- a/www/js/TimelineCtrl.js +++ b/www/js/TimelineCtrl.js @@ -276,6 +276,10 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla $scope.$on('$ionicView.enter', function () { + + // Make sure sliding for menu is disabled so it + // does not interfere with graph panning + $ionicSideMenuDelegate.canDragContent(false); var ld = ZMDataModel.getLogin(); maxItemsConf = ($rootScope.platformOS == 'desktop') ? zm.graphDesktopItemMax: zm.graphItemMax; maxItems = ld.graphSize || maxItemsConf; @@ -348,9 +352,6 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla var curFromDate, curToDate, curCount; - // Make sure sliding for menu is disabled so it - // does not interfere with graph panning - $ionicSideMenuDelegate.canDragContent(false); document.addEventListener("pause", onPause, false); -- cgit v1.2.3