From 1af01a05ee5692f0af13e815acf171215cf869b7 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Wed, 27 Dec 2017 15:11:02 -0500 Subject: remove temp state if setLogin called - this was causing issues in android with eventserver settings blanking out --- www/js/EventServerSettingsCtrl.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'www/js/EventServerSettingsCtrl.js') diff --git a/www/js/EventServerSettingsCtrl.js b/www/js/EventServerSettingsCtrl.js index e80c9f01..dc88b30b 100644 --- a/www/js/EventServerSettingsCtrl.js +++ b/www/js/EventServerSettingsCtrl.js @@ -63,8 +63,14 @@ $scope.$on('$ionicView.beforeEnter', function() { + $scope.loginData = NVRDataModel.getLogin(); //console.log ("Event server - before Enter, loginData is " + JSON.stringify($scope.loginData)); + + console.log ("BEFORE ENTER I GOT " + JSON.stringify($scope.loginData)); + + + $scope.defScreen = $scope.loginData.onTapScreen; if ($scope.loginData.eventServer == "") @@ -217,7 +223,7 @@ $scope.loginData.eventServerMonitors = monstring; $scope.loginData.eventServerInterval = intervalstring; - //console.log ("SAVED: " + JSON.stringify($scope.loginData)); + console.log ("SAVED: " + JSON.stringify($scope.loginData)); NVRDataModel.setLogin($scope.loginData); var pushstate = "enabled"; -- cgit v1.2.3