summaryrefslogtreecommitdiff
path: root/www/js/EventServerSettingsCtrl.js
diff options
context:
space:
mode:
authorPliable Pixels <pliablepixels@gmail.com>2017-12-27 15:11:02 -0500
committerPliable Pixels <pliablepixels@gmail.com>2017-12-27 15:11:02 -0500
commit1af01a05ee5692f0af13e815acf171215cf869b7 (patch)
tree49dccfc00c635f13bee9e0b4f306fd3c7258c0f7 /www/js/EventServerSettingsCtrl.js
parentd77d5e2e321e9f17b736d87b38e32992bd8ffea3 (diff)
remove temp state if setLogin called - this was causing issues in android with eventserver settings blanking out
Diffstat (limited to 'www/js/EventServerSettingsCtrl.js')
-rw-r--r--www/js/EventServerSettingsCtrl.js8
1 files changed, 7 insertions, 1 deletions
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";