summaryrefslogtreecommitdiff
path: root/www/js/app.js
diff options
context:
space:
mode:
authorPliable Pixels <pliablepixels@gmail.com>2018-09-12 20:15:20 -0400
committerPliable Pixels <pliablepixels@gmail.com>2018-09-12 20:15:20 -0400
commitb2ad62461c8993c33068d1b0215f36deba0e1c9f (patch)
tree605ed1945cd2a55b10437b037fd465bade7e6a0f /www/js/app.js
parent7025aa4ec599593a80e2d3c2249b49eae7ef9f6a (diff)
#704 chaining fixes
Diffstat (limited to 'www/js/app.js')
-rwxr-xr-xwww/js/app.js19
1 files changed, 13 insertions, 6 deletions
diff --git a/www/js/app.js b/www/js/app.js
index abe2b0bd..f0ca9ffe 100755
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -1751,15 +1751,22 @@ angular.module('zmApp', [
- if ((NVRDataModel.hasLoginInfo() || toState.data.requireLogin == false) && toState.name != "app.invalidapi" && toState.name != "app.refresh") {
+ if ((NVRDataModel.hasLoginInfo() || toState.data.requireLogin == false) && toState.name != "app.invalidapi" ) {
//console.log("State transition is authorized");
- NVRDataModel.debug ("Setting last-desktop-state to:"+JSON.stringify(toState));
- localforage.setItem('last-desktop-state', {
- 'name': toState.name,
- 'params': toState.params
- });
+
+ if (toState.name != "app.refresh") {
+
+ NVRDataModel.debug ("Setting last-desktop-state to:"+JSON.stringify(toState));
+ localforage.setItem('last-desktop-state', {
+ 'name': toState.name,
+ 'params': toState.params
+ });
+
+
+ }
$rootScope.dpadState = toState.name.replace("app.", "");
return;
+
} else {
NVRDataModel.log("In Auth State trans: Not logged in, requested to go to " + JSON.stringify(toState));
// event.preventDefault();