summaryrefslogtreecommitdiff
path: root/www/js/app.js
diff options
context:
space:
mode:
authorPliable Pixels <pliablepixels@gmail.com>2018-09-12 16:02:50 -0400
committerPliable Pixels <pliablepixels@gmail.com>2018-09-12 16:02:50 -0400
commit28c74214a035e16e2996bab805c6e5ee7325e3a1 (patch)
tree3987de5c745849677b3801946f8e77c58a067f2d /www/js/app.js
parent0eee7654d348a4b0c71e7097be3cd2d3b9ce62cd (diff)
#704 initial code, need to check error cases
Diffstat (limited to 'www/js/app.js')
-rwxr-xr-xwww/js/app.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/www/js/app.js b/www/js/app.js
index b5f1b804..abe2b0bd 100755
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -1751,7 +1751,7 @@ angular.module('zmApp', [
- if (NVRDataModel.hasLoginInfo() || toState.data.requireLogin == false) {
+ if ((NVRDataModel.hasLoginInfo() || toState.data.requireLogin == false) && toState.name != "app.invalidapi" && toState.name != "app.refresh") {
//console.log("State transition is authorized");
NVRDataModel.debug ("Setting last-desktop-state to:"+JSON.stringify(toState));
localforage.setItem('last-desktop-state', {
@@ -1766,7 +1766,7 @@ angular.module('zmApp', [
//
$rootScope.dpadState = "login";
- $state.transitionTo('login');
+ $state.transitionTo('app.login');
}