diff options
| -rw-r--r-- | package.json | 4 | ||||
| -rw-r--r-- | www/js/MenuController.js | 16 |
2 files changed, 17 insertions, 3 deletions
diff --git a/package.json b/package.json index 7a53f69e..8f653b45 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "zmninjapro", "description": "Home security mobile app for ZoneMinder", - "version":"1.3.018", + "version": "1.3.018", "displayName": "zmNinja", "author": "Pliable Pixels", "license": "custom see LICENSE.md", @@ -181,4 +181,4 @@ ] } } -} +}
\ No newline at end of file diff --git a/www/js/MenuController.js b/www/js/MenuController.js index 2970243d..c221aebe 100644 --- a/www/js/MenuController.js +++ b/www/js/MenuController.js @@ -131,6 +131,10 @@ angular.module('zmApp.controllers').controller('MenuController', ['$scope', '$io .then (function () { + $ionicHistory.nextViewOptions({ + disableBack: true + }); + $state.go('app.refresh', { "view": $state.current.name }); @@ -145,6 +149,10 @@ angular.module('zmApp.controllers').controller('MenuController', ['$scope', '$io $rootScope.apiVersion = "0.0.0"; NVRDataModel.debug("Error, failed API version, setting to " + $rootScope.apiVersion); + $ionicHistory.nextViewOptions({ + disableBack: true + }); + $state.go('app.refresh', { "view": $state.current.name }); @@ -168,6 +176,9 @@ angular.module('zmApp.controllers').controller('MenuController', ['$scope', '$io .then(function (data) { var refresh = NVRDataModel.getMonitors(1); $rootScope.apiVersion = data; + $ionicHistory.nextViewOptions({ + disableBack: true + }); $state.go('app.refresh', { "view": $state.current.name }); @@ -177,6 +188,9 @@ angular.module('zmApp.controllers').controller('MenuController', ['$scope', '$io var refresh = NVRDataModel.getMonitors(1); $rootScope.apiVersion = "0.0.0"; NVRDataModel.debug("Error, failed API version, setting to " + $rootScope.apiVersion); + $ionicHistory.nextViewOptions({ + disableBack: true + }); $state.go('app.refresh', { "view": $state.current.name }); @@ -207,7 +221,7 @@ angular.module('zmApp.controllers').controller('MenuController', ['$scope', '$io $scope.newServer = { val:"" - } + }; $scope.avs = Object.keys(NVRDataModel.getServerGroups()); $scope.avs = $scope.avs.filter(function() { return true; }); |