summaryrefslogtreecommitdiff
path: root/www/js/DataModel.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/DataModel.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/DataModel.js')
-rwxr-xr-xwww/js/DataModel.js5
1 files changed, 4 insertions, 1 deletions
diff --git a/www/js/DataModel.js b/www/js/DataModel.js
index 7b46f4ee..f9a294f9 100755
--- a/www/js/DataModel.js
+++ b/www/js/DataModel.js
@@ -384,6 +384,9 @@ angular.module('zmApp.controllers')
function setLogin(newLogin) {
//var d = $q.defer();
+ // if we are here, we should remove cache
+ localforage.removeItem("settings-temp-data");
+
loginData = angular.copy(newLogin);
serverGroupList[loginData.serverName] = angular.copy(loginData);
@@ -736,7 +739,7 @@ angular.module('zmApp.controllers')
if (loginData.onTapScreen != $translate.instant('kTapMontage') &&
loginData.onTapScreen != $translate.instant('kTapEvents') &&
loginData.onTapScreen != $translate.instant('kTapLiveMonitor')) {
- log("Invalid onTap setting found, resetting");
+ log("Invalid onTap setting found, resetting. I got " + loginData.onTapScreen);
loginData.onTapScreen = $translate.instant('kMontage');
}