diff options
| -rw-r--r-- | package.json | 7 | ||||
| -rw-r--r-- | www/js/TimelineCtrl.js | 7 |
2 files changed, 5 insertions, 9 deletions
diff --git a/package.json b/package.json index 6064eb22..3ad60a76 100644 --- a/package.json +++ b/package.json @@ -81,11 +81,6 @@ "version": "", "locator": "android_temp" }, - "android", - { - "platform": "android", - "version": "", - "locator": "android" - } + "android" ] } 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); |