diff options
Diffstat (limited to 'www')
| -rw-r--r-- | www/js/DataModel.js | 5 | ||||
| -rw-r--r-- | www/js/EventModalCtrl.js | 2 | ||||
| -rw-r--r-- | www/js/app.js | 11 |
3 files changed, 14 insertions, 4 deletions
diff --git a/www/js/DataModel.js b/www/js/DataModel.js index 70fd5caf..19333fa5 100644 --- a/www/js/DataModel.js +++ b/www/js/DataModel.js @@ -260,6 +260,7 @@ angular.module('zmApp.controllers') // OK: do something with firstReachableUrl }, function () { d.reject ("No servers reachable"); + loginData = savedLoginData; return d.promise; // KO: no url could be reached }); @@ -285,8 +286,8 @@ angular.module('zmApp.controllers') zmLog ("Success: reachability on "+ urls[0].url); $ionicLoading.hide(); return urls[0]; - }, function() { - zmLog ("Failed reachability on "+ urls[0].url); + }, function(err) { + zmLog ("Failed reachability on "+ urls[0].url+ " with error " + JSON.stringify(err)); return findFirstReachableUrl(urls.slice(1)); }); } diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js index 6b2db716..afa46083 100644 --- a/www/js/EventModalCtrl.js +++ b/www/js/EventModalCtrl.js @@ -494,7 +494,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro $rootScope.zmPopup = $ionicPopup.show({ template: '<center>Frame: {{slideIndex+1}} of {{slideLastIndex+1}}</center><br/><img src="{{selectEventUrl}}" width="100%" />', - title: 'Select frame to save', + title: 'Select '+ (onlyAlarms?'Alarmed ':'')+'frame to save', subTitle: 'use left and right arrows to change', scope: $scope, cssClass: 'popup80', diff --git a/www/js/app.js b/www/js/app.js index a471ffe4..f43c1b4f 100644 --- a/www/js/app.js +++ b/www/js/app.js @@ -768,8 +768,17 @@ angular.module('zmApp', [ function (error) { ZMDataModel.zmLog ("REACHABILITY ERROR " + JSON.stringify(error)); + ZMDataModel.zmLog ("Still trying to proceed with " + ZMDataModel.getLogin().serverName); + /* d.reject (error); - return d.promise; + return d.promise;*/ + proceedWithLogin() + .then (function(success) + { d.resolve(success); return d.promise;}, + function(error) + { d.reject(error); return d.promise;}); + + }); return d.promise; |