diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2016-10-21 09:15:31 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2016-10-21 09:15:31 -0400 |
| commit | 7dbdc4e09de2fe24460190cead2ee317165c9453 (patch) | |
| tree | 21c911dc440c808a263c347f5e3d0f8f1fff84f0 /www/js/app.js | |
| parent | c24e0850bddaf1d96df01131f5647dea6eaf04f2 (diff) | |
adding returns after state.go --> seems it takes time to go and code continues to execute below it - WTF!
Former-commit-id: f1f7e2d62f47f9528d163db43fa166d088b0a819
Diffstat (limited to 'www/js/app.js')
| -rw-r--r-- | www/js/app.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/www/js/app.js b/www/js/app.js index 6badb37f..57fa932b 100644 --- a/www/js/app.js +++ b/www/js/app.js @@ -721,6 +721,7 @@ angular.module('zmApp', [ NVRDataModel.log(">>>>>>>>>>>>>>> All init over, going to portal login"); $ionicHistory.nextViewOptions({ disableAnimate: true}); $state.go("zm-portal-login"); + return; }); //------------------------------------------------------------------ @@ -1129,7 +1130,7 @@ angular.module('zmApp', [ $state.go("login", { "wizard": false }); - + return; }; //--------------------------------------------------------------------------- @@ -1416,6 +1417,7 @@ angular.module('zmApp', [ if (val == null || val == true) { NVRDataModel.log("First time detected"); $state.go("first-use"); + return; } else { continueRestOfInit(); } @@ -1485,12 +1487,14 @@ angular.module('zmApp', [ NVRDataModel.debug("going to portal login"); $ionicHistory.nextViewOptions({ disableAnimate: true}); $state.go("zm-portal-login"); + return; } else { $rootScope.lastState = ""; $rootScope.lastStateParam = ""; NVRDataModel.debug("reset lastState to null"); $ionicHistory.nextViewOptions({ disableAnimate: true}); $state.go("zm-portal-login"); + return; } }, forceDelay); |