summaryrefslogtreecommitdiff
path: root/www/js/EventServerSettingsCtrl.js
diff options
context:
space:
mode:
authorPliable Pixels <pliablepixels@gmail.com>2018-01-07 17:24:16 -0500
committerPliable Pixels <pliablepixels@gmail.com>2018-01-07 17:24:16 -0500
commit9c41352c661460f10d35c31292b5d80420b8fa9c (patch)
tree35ef21c42750c65f53237369e0f441e86d89870a /www/js/EventServerSettingsCtrl.js
parent92ea11058bf3ca356f09fabd5f6bc67ff63bdddb (diff)
#499 fixed onTap messing up event server URL and restore inconsistencies
Diffstat (limited to 'www/js/EventServerSettingsCtrl.js')
-rw-r--r--www/js/EventServerSettingsCtrl.js14
1 files changed, 7 insertions, 7 deletions
diff --git a/www/js/EventServerSettingsCtrl.js b/www/js/EventServerSettingsCtrl.js
index 3ec702b7..8bf08e2e 100644
--- a/www/js/EventServerSettingsCtrl.js
+++ b/www/js/EventServerSettingsCtrl.js
@@ -123,10 +123,10 @@
$scope.selectScreen = function()
{
- var ld = NVRDataModel.getLogin();
+ // var ld = NVRDataModel.getLogin();
$scope.myopt = {
- selectedState: ld.onTapScreen
+ selectedState: $scope.loginData.onTapScreen
};
var options = '<ion-radio-fix ng-model="myopt.selectedState" ng-value="\'' + $translate.instant('kTapEvents') + '\'">' + $translate.instant('kTapEvents') + '</ion-radio-fix>';
@@ -140,7 +140,7 @@
template: options,
title: 'View to navigate to:',
- subTitle: 'currently set to: ' + ld.onTapScreen,
+ subTitle: 'currently set to: ' + $scope.loginData.onTapScreen,
buttons: [
{
text: $translate.instant('kButtonCancel'),
@@ -151,11 +151,11 @@
onTap: function(e)
{
- ld.onTapScreen = $scope.myopt.selectedState;
- NVRDataModel.log("Setting new onTap State:" + ld.onTapScreen);
- NVRDataModel.setLogin(ld);
+ $scope.loginData.onTapScreen = $scope.myopt.selectedState;
+ NVRDataModel.log("Setting new onTap State:" + $scope.loginData.onTapScreen);
+ NVRDataModel.setLogin($scope.loginData);
$scope.defScreen = $scope.myopt.selectedState;
- $scope.loginData = ld;
+ //$scope.loginData = ld;
}
}]