summaryrefslogtreecommitdiff
path: root/www/js/DataModel.js
diff options
context:
space:
mode:
authorpliablepixels <pliablepixels@gmail.com>2016-05-06 05:58:14 -0400
committerpliablepixels <pliablepixels@gmail.com>2016-05-06 05:58:14 -0400
commit81ec89ba112791973caddc0d21c691e7e953a296 (patch)
tree17ec48d340e9a55654291f329ea56794f42648b8 /www/js/DataModel.js
parent4a3488f925aeda6a878b151243c6405483a72fb7 (diff)
if you cancel portal login,kill http requests that are pending and get out of reachability recursion
Former-commit-id: 06c00c92f4cefaad9595ab244a7427038eed6dd3
Diffstat (limited to 'www/js/DataModel.js')
-rw-r--r--www/js/DataModel.js2
1 files changed, 1 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);