diff options
Diffstat (limited to 'www')
| -rw-r--r-- | www/js/EventServer.js | 5 | ||||
| -rw-r--r-- | www/js/EventServerSettingsCtrl.js | 14 | ||||
| -rw-r--r-- | www/js/LoginCtrl.js | 10 |
3 files changed, 18 insertions, 11 deletions
diff --git a/www/js/EventServer.js b/www/js/EventServer.js index 18dd482e..e3febfb6 100644 --- a/www/js/EventServer.js +++ b/www/js/EventServer.js @@ -347,6 +347,7 @@ angular.module('zmApp.controllers') return; } + console.log (">>>>>>>>>>>>>>>>>EVENT SERVER SENDING: type="+type+" DATA="+JSON.stringify(obj)); ws.send({ 'event':type, 'data': obj @@ -517,8 +518,8 @@ angular.module('zmApp.controllers') // load previous monlist and intlist // so we don't overwrite monstring = ld.eventServerMonitors; - intlist = ld.eventServerInterval; - NVRDataModel.debug ("loading saved monitor list and interval of "+monstring+">>"+intlist); + intstring = ld.eventServerInterval; + NVRDataModel.debug ("loading saved monitor list and interval of "+monstring+">>"+intstring); } 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; } }] diff --git a/www/js/LoginCtrl.js b/www/js/LoginCtrl.js index 731949e9..b27a1203 100644 --- a/www/js/LoginCtrl.js +++ b/www/js/LoginCtrl.js @@ -312,7 +312,13 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r else { var savedData; - localforage.getItem("settings-temp-data").then(function(value) + + // this thing is crappy - not sure why it keeps removing + // ES stuff. removing it as of Jan 18 + // this means if you back out while entering login data + // you'll get a blank. small price to pay... + + /*localforage.getItem("settings-temp-data").then(function(value) { savedData = value; //= zmStorageService.getObject ("settings-temp-data"); @@ -327,7 +333,7 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r { NVRDataModel.log("Not recovering login data as its empty"); } - }); + });*/ } oldLoginData = JSON.stringify($scope.loginData); |