summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPliable Pixels <pliablepixels@gmail.com>2016-07-13 13:57:34 -0400
committerPliable Pixels <pliablepixels@gmail.com>2016-07-13 13:57:34 -0400
commit102cddc04792f0f1a097d46f71ee914c0e8bd545 (patch)
tree3cd1491ec1215e6374cf764ed561de0a54d132f4
parent2a23d885952f1bfeddba18af2d6daf7065280417 (diff)
if you switch to background mode during creating a new login setup it recovers this data
Former-commit-id: fbdc6a632284dbb4012e3d612e43d989708473ae
-rw-r--r--www/js/DataModel.js4
-rw-r--r--www/js/LoginCtrl.js33
2 files changed, 37 insertions, 0 deletions
diff --git a/www/js/DataModel.js b/www/js/DataModel.js
index bc0b5a9a..bd699971 100644
--- a/www/js/DataModel.js
+++ b/www/js/DataModel.js
@@ -201,6 +201,10 @@ angular.module('zmApp.controllers')
// used by various controllers to log messages to file
//-------------------------------------------------------------
+ isEmpty: function (obj)
+ {
+ return isEmpty(obj);
+ },
zmLog: function (val, type) {
var logtype = 'info';
diff --git a/www/js/LoginCtrl.js b/www/js/LoginCtrl.js
index 5c81b102..06164891 100644
--- a/www/js/LoginCtrl.js
+++ b/www/js/LoginCtrl.js
@@ -20,6 +20,24 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r
$scope.check.isUseAuth = ($scope.loginData.isUseAuth ) ? true : false;
$scope.check.isUseEventServer = ($scope.loginData.isUseEventServer == true) ? true : false;
+
+
+ document.addEventListener("pause", onPause, false);
+ document.addEventListener("resume", onResume, false);
+
+ function onResume()
+ {
+ ZMDataModel.zmLog ("Login screen resumed");
+
+ }
+
+ function onPause()
+ {
+ ZMDataModel.zmLog ("Login screen going to background, saving data");
+ $localstorage.setObject ("settings-temp-data",$scope.loginData);
+
+ }
+
//----------------------------------------------------------------
// Alarm notification handling
@@ -231,6 +249,21 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r
}
+ else
+ {
+ var savedData = $localstorage.getObject ("settings-temp-data");
+ if (! ZMDataModel.isEmpty(savedData))
+ {
+ $scope.loginData = savedData;
+ ZMDataModel.zmLog ("retrieved pre-stored loginData on past pause: " + JSON.stringify($scope.loginData));
+ $localstorage.setObject("settings-temp-data", {});
+ }
+ else
+ {
+ ZMDataModel.zmLog ("Not recovering login data as its empty");
+ }
+ }
+
});