diff options
| -rw-r--r-- | www/js/EventCtrl.js | 2 | ||||
| -rw-r--r-- | www/js/MonitorCtrl.js | 1 | ||||
| -rw-r--r-- | www/js/MontageCtrl.js | 2 | ||||
| -rw-r--r-- | www/js/MontageHistoryCtrl.js | 2 | ||||
| -rw-r--r-- | www/js/PortalLoginCtrl.js | 2 |
5 files changed, 5 insertions, 4 deletions
diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js index 2b3829d8..085893f7 100644 --- a/www/js/EventCtrl.js +++ b/www/js/EventCtrl.js @@ -713,7 +713,7 @@ angular.module('zmApp.controllers') $scope.currentEvent = ""; $scope.event = event; //$ionicScrollDelegate.freezeScroll(true); - $ionicSideMenuDelegate.canDragContent(false); + $ionicSideMenuDelegate.canDragContent(true); $scope.slider_options = { from: 1, to: event.Event.Frames, diff --git a/www/js/MonitorCtrl.js b/www/js/MonitorCtrl.js index 9db218cc..a217a462 100644 --- a/www/js/MonitorCtrl.js +++ b/www/js/MonitorCtrl.js @@ -274,6 +274,7 @@ angular.module('zmApp.controllers') $scope.$on('$ionicView.enter', function () { // console.log("**VIEW ** Monitor Ctrl Entered"); ZMDataModel.setAwake(false); + $ionicSideMenuDelegate.canDragContent(true); }); $scope.$on('$ionicView.leave', function () { diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js index ba369771..920571dc 100644 --- a/www/js/MontageCtrl.js +++ b/www/js/MontageCtrl.js @@ -83,7 +83,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', ' var modalIntervalHandle; - $ionicSideMenuDelegate.canDragContent($scope.minimal? true: false); + $ionicSideMenuDelegate.canDragContent($scope.minimal? true: true); $rootScope.authSession = "undefined"; diff --git a/www/js/MontageHistoryCtrl.js b/www/js/MontageHistoryCtrl.js index bc5cbf5b..b054437e 100644 --- a/www/js/MontageHistoryCtrl.js +++ b/www/js/MontageHistoryCtrl.js @@ -690,7 +690,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc var sizeInProgress = false; $scope.imageStyle = true; - $ionicSideMenuDelegate.canDragContent(false); + $ionicSideMenuDelegate.canDragContent(true); diff --git a/www/js/PortalLoginCtrl.js b/www/js/PortalLoginCtrl.js index b12b9a67..abd4641a 100644 --- a/www/js/PortalLoginCtrl.js +++ b/www/js/PortalLoginCtrl.js @@ -252,7 +252,7 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic // console.log("************* ENTERING PORTAL MAIN "); ZMDataModel.zmLog ("Entering Portal Main"); var loginData; - $ionicSideMenuDelegate.canDragContent(false); + $ionicSideMenuDelegate.canDragContent(true); |