#854 toggle controls

5 files changed, 28 insertions, 3 deletions

diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js
index e15b2dc9..92eae748 100644
--- a/www/js/EventModalCtrl.js
+++ b/www/js/EventModalCtrl.js
@@ -1075,9 +1075,14 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
 
   });
 
+  $scope.showHideControls = function () {
+    $scope.displayControls = !$scope.displayControls;
+    NVR.debug ('control display is:'+$scope.displayControls);
+  };
 
   $scope.$on('modal.shown', function (e, m) {
 
+    $scope.displayControls = true;
     $ionicLoading.hide();
     if (m.id != 'footage')
       return;
diff --git a/www/js/MomentCtrl.js b/www/js/MomentCtrl.js
index 186df5cd..c53974a3 100644
--- a/www/js/MomentCtrl.js
+++ b/www/js/MomentCtrl.js
@@ -8,7 +8,7 @@
 
 angular.module('zmApp.controllers').controller('zmApp.MomentCtrl', ['$scope', '$rootScope', '$ionicModal', 'NVR', '$ionicSideMenuDelegate', '$ionicHistory', '$state', '$translate', '$templateRequest', '$sce', '$compile', '$http', '$ionicLoading', 'zm', '$timeout', '$q', '$ionicPopover', '$ionicPopup', 'message', '$ionicScrollDelegate', function ($scope, $rootScope, $ionicModal, NVR, $ionicSideMenuDelegate, $ionicHistory, $state, $translate, $templateRequest, $sce, $compile, $http, $ionicLoading, zm, $timeout, $q, $ionicPopover, $ionicPopup, message, $ionicScrollDelegate) {
 
-  var masonry = null;
+var masonry = null;
   var timeFrom;
   var timeTo;
   var moments = [];
diff --git a/www/js/MonitorModalCtrl.js b/www/js/MonitorModalCtrl.js
index 1f0ce944..903c2e2a 100644
--- a/www/js/MonitorModalCtrl.js
+++ b/www/js/MonitorModalCtrl.js
@@ -5,6 +5,7 @@
 
 angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$rootScope', 'zm', 'NVR', '$ionicSideMenuDelegate', '$timeout', '$interval', '$ionicModal', '$ionicLoading', '$http', '$state', '$stateParams', '$ionicHistory', '$ionicScrollDelegate', '$q', '$sce', 'carouselUtils', '$ionicPopup', 'SecuredPopups', '$translate', '$cordovaFile', function ($scope, $rootScope, zm, NVR, $ionicSideMenuDelegate, $timeout, $interval, $ionicModal, $ionicLoading, $http, $state, $stateParams, $ionicHistory, $ionicScrollDelegate, $q, $sce, carouselUtils, $ionicPopup, SecuredPopups, $translate, $cordovaFile) {
 
+  $scope.displayControls = true;
   $scope.animationInProgress = false;
   $scope.imageFit = true;
   $scope.isModalActive = true;
@@ -1782,9 +1783,14 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
 
   }
 
-  $scope.$on('modal.shown', function () {
+  $scope.showHideControls = function () {
+    $scope.displayControls = !$scope.displayControls;
+    NVR.debug ('control display is:'+$scope.displayControls);
+  };
 
+  $scope.$on('modal.shown', function () {
 
+    $scope.displayControls = true;
     if (0 && $rootScope.platformOS == 'ios') {
       NVR.debug("Webkit hack, hammering window.stop();");
       NVR.stopNetwork();
diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js
index 6292bae9..edca6dbb 100644
--- a/www/js/MontageCtrl.js
+++ b/www/js/MontageCtrl.js
@@ -1065,6 +1065,20 @@ angular.module('zmApp.controllers')
       NVR.debug("MontageCtrl: switch minimal is " + $scope.minimal);
       // console.log("Hide Statusbar");
       ionic.Platform.fullScreen($scope.minimal, !$scope.minimal);
+
+      // hiding status bar messes up X
+      /*if ($scope.minimal) {
+        if ($rootScope.platformOS !='desktop') {
+          NVR.debug ('hiding device status bar');
+          return StatusBar.hide();
+        }
+      } else {
+        if ($rootScope.platformOS !='desktop') {
+          NVR.debug ('showing device status bar');
+          return StatusBar.show();
+        }
+      }*/
+
       //console.log ("minimal switch:Cancelling timer");
       $interval.cancel(intervalHandleMontage); //we will renew on reload
       $interval.cancel(intervalHandleMontageCycle);
diff --git a/www/js/NVR.js b/www/js/NVR.js
index b8b3f57b..71d58df1 100644
--- a/www/js/NVR.js
+++ b/www/js/NVR.js
@@ -21,7 +21,7 @@ angular.module('zmApp.controllers')
         DO NOT TOUCH zmAppVersion
         It is changed by sync_version.sh
       */
-      var zmAppVersion = "1.3.078";
+      var zmAppVersion = "1.3.079";
       var isBackground = false;
       var justResumed = false;
       var timeSinceResumed = -1;