diff options
| author | pliablepixels <pliablepixels@gmail.com> | 2016-03-23 14:21:54 -0400 |
|---|---|---|
| committer | pliablepixels <pliablepixels@gmail.com> | 2016-03-23 14:21:54 -0400 |
| commit | fad1846bc42f42e81c471099eb9ebd5be717e7be (patch) | |
| tree | eec223946f2e8a0442fe9610a10261afaca33b0e /www | |
| parent | 53485a9807f7fbd09ead2a0d17fa1105ea1c0f6b (diff) | |
#208 - first login, then do reachability
Former-commit-id: 09fb5b533a3d78bd18eed99240c35f982b8c5a2e
Diffstat (limited to 'www')
| -rw-r--r-- | www/js/app.js | 36 |
1 files changed, 30 insertions, 6 deletions
diff --git a/www/js/app.js b/www/js/app.js index f43c1b4f..26a3a92d 100644 --- a/www/js/app.js +++ b/www/js/app.js @@ -752,9 +752,35 @@ angular.module('zmApp', [ return d.promise; } + // first try to login, if it works, good + // else try to do reachability + proceedWithLogin() + .then (function (success) + { + d.resolve (success); + return d.promise; + }, + function (error) + // login to main failed, so try others + { + ZMDataModel.getReachableConfig() + .then (function (data) + { + proceedWithLogin() + .then (function(success) + { d.resolve(success); return d.promise;}, + function(error) + { d.reject(error); return d.promise;}); + + }, + function (error) + { + d.reject(error); return d.promise; + }); + + }); - - ZMDataModel.getReachableConfig() + /*ZMDataModel.getReachableConfig() .then (function (data) { ZMDataModel.zmLog ("REACHABILITY SUCCESS " + JSON.stringify(data)); @@ -769,9 +795,7 @@ angular.module('zmApp', [ { ZMDataModel.zmLog ("REACHABILITY ERROR " + JSON.stringify(error)); ZMDataModel.zmLog ("Still trying to proceed with " + ZMDataModel.getLogin().serverName); - /* - d.reject (error); - return d.promise;*/ + proceedWithLogin() .then (function(success) { d.resolve(success); return d.promise;}, @@ -779,7 +803,7 @@ angular.module('zmApp', [ { d.reject(error); return d.promise;}); - }); + });*/ return d.promise; |