diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2018-09-12 20:17:38 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2018-09-12 20:17:38 -0400 |
| commit | 86c7167a61d0a0a5a5117c8f03f7d4cb4d15796b (patch) | |
| tree | 7d264333cf38f9b5768cc1c9c4cf49590122429c /www | |
| parent | b2ad62461c8993c33068d1b0215f36deba0e1c9f (diff) | |
#704 make sure all state gos are after getMonitor returns - in case
Diffstat (limited to 'www')
| -rw-r--r-- | www/js/MenuController.js | 49 |
1 files changed, 29 insertions, 20 deletions
diff --git a/www/js/MenuController.js b/www/js/MenuController.js index 18cd5989..254c73c9 100644 --- a/www/js/MenuController.js +++ b/www/js/MenuController.js @@ -145,20 +145,25 @@ angular.module('zmApp.controllers').controller('MenuController', ['$scope', '$io }, function (error) { - var refresh = NVRDataModel.getMonitors(1); - console.log ("+++ state go after API version error: "+error); - $rootScope.apiVersion = "0.0.0"; - NVRDataModel.debug("Error, failed API version, setting to " + $rootScope.apiVersion); + var refresh = NVRDataModel.getMonitors(1) + .then (function() { + console.log ("+++ state go after API version error: "+error); + $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 + }); + return; - $ionicHistory.nextViewOptions({ - disableBack: true }); - $state.go('app.refresh', { - "view": $state.current.name - }); - return; }); @@ -192,17 +197,21 @@ angular.module('zmApp.controllers').controller('MenuController', ['$scope', '$io }, function (error) { - var refresh = NVRDataModel.getMonitors(1); - $rootScope.apiVersion = "0.0.0"; - NVRDataModel.debug("Error, failed API version, setting to " + $rootScope.apiVersion); - $ionicHistory.nextViewOptions({ - disableBack: true - }); - console.log ("+++ state go after API version force"); - $state.go('app.refresh', { - "view": $state.current.name + var refresh = NVRDataModel.getMonitors(1) + .then (function() { + $rootScope.apiVersion = "0.0.0"; + NVRDataModel.debug("Error, failed API version, setting to " + $rootScope.apiVersion); + $ionicHistory.nextViewOptions({ + disableBack: true + }); + console.log ("+++ state go after API version force"); + $state.go('app.refresh', { + "view": $state.current.name + }); + return; + }); - return; + }); }); |