diff options
Diffstat (limited to 'www/js')
| -rw-r--r-- | www/js/ImportantMessageCtrl.js | 2 | ||||
| -rw-r--r-- | www/js/PortalLoginCtrl.js | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/www/js/ImportantMessageCtrl.js b/www/js/ImportantMessageCtrl.js index 814359cf..29e27d2f 100644 --- a/www/js/ImportantMessageCtrl.js +++ b/www/js/ImportantMessageCtrl.js @@ -14,7 +14,7 @@ angular.module('zmApp.controllers').controller('zmApp.ImportantMessageCtrl', ['$ // Controller Main //------------------------------------------------------------------------ $scope.$on('$ionicView.enter', function () { - //console.log("**VIEW ** LowVersion Ctrl Entered"); + console.log("**VIEW ** LowVersion Ctrl Entered"); $ionicSideMenuDelegate.canDragContent(true); $scope.requiredVersion = zm.minAppVersion; $scope.currentVersion = $stateParams.ver; diff --git a/www/js/PortalLoginCtrl.js b/www/js/PortalLoginCtrl.js index ac3847f3..463cb77b 100644 --- a/www/js/PortalLoginCtrl.js +++ b/www/js/PortalLoginCtrl.js @@ -211,13 +211,17 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic $state.go('lowversion', { "ver": data }); + return; } if (NVRDataModel.versionCompare(data, zm.recommendedAppVersion) == -1 && data != "0.0.0") { + // console.log (">>>>>>>>>>>>> HERE AND VERSION SAYS " +NVRDataModel.versionCompare(data, zm.recommendedAppVersion)); + //console.log ("GOING TO IMPORTANT"); $state.go('importantmessage', { "ver": data }); + return; } if (data == "0.0.0") { @@ -227,9 +231,11 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic $state.go("login", { "wizard": false }); + return; } // coming here means continue + // console.log (">>>>>>>>>>>>>>>>>>>>>>>>>NEVER"); EventServer.refresh(); var statetoGo = $rootScope.lastState ? $rootScope.lastState : 'montage'; NVRDataModel.debug("logging state transition"); |