diff options
| author | pliablepixels <pliablepixels@gmail.com> | 2016-05-06 05:58:14 -0400 |
|---|---|---|
| committer | pliablepixels <pliablepixels@gmail.com> | 2016-05-06 05:58:14 -0400 |
| commit | 81ec89ba112791973caddc0d21c691e7e953a296 (patch) | |
| tree | 17ec48d340e9a55654291f329ea56794f42648b8 | |
| parent | 4a3488f925aeda6a878b151243c6405483a72fb7 (diff) | |
if you cancel portal login,kill http requests that are pending and get out of reachability recursion
Former-commit-id: 06c00c92f4cefaad9595ab244a7427038eed6dd3
| -rw-r--r-- | www/js/DataModel.js | 2 | ||||
| -rw-r--r-- | www/js/app.js | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/www/js/DataModel.js b/www/js/DataModel.js index 53a79ecd..f46508f3 100644 --- a/www/js/DataModel.js +++ b/www/js/DataModel.js @@ -324,7 +324,7 @@ angular.module('zmApp.controllers') function findFirstReachableUrl (urls) { - if (urls.length > 0) + if (urls.length > 0 && $rootScope.userCancelledAuth != true) { $ionicLoading.show({template: 'trying ' + urls[0].server}); zmLog ("Reachability test.." + urls[0].url); diff --git a/www/js/app.js b/www/js/app.js index dca1aa6e..be606515 100644 --- a/www/js/app.js +++ b/www/js/app.js @@ -1107,6 +1107,7 @@ angular.module('zmApp', [ disableBack: true }); $rootScope.userCancelledAuth = true; + window.stop(); $state.go("login" ,{"wizard": false}); }; |