diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2020-05-15 10:09:55 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2020-05-15 10:09:55 -0400 |
| commit | 251f3ec09ef9ac99f273be2051be12ebb3a63c3c (patch) | |
| tree | ac409dfd776faaf266fa081df6aaf4b9ae21ef28 /www | |
| parent | 79b8c40be89fabd016e723a68abe985d61fb8a81 (diff) | |
make sure first use state works - initComplete doesn't block it!
Diffstat (limited to 'www')
| -rw-r--r-- | www/js/NVR.js | 9 | ||||
| -rwxr-xr-x | www/js/app.js | 3 |
2 files changed, 8 insertions, 4 deletions
diff --git a/www/js/NVR.js b/www/js/NVR.js index c09c37f0..2278ad54 100644 --- a/www/js/NVR.js +++ b/www/js/NVR.js @@ -21,7 +21,7 @@ angular.module('zmApp.controllers') DO NOT TOUCH zmAppVersion It is changed by sync_version.sh */ - var zmAppVersion = "1.4.006"; + var zmAppVersion = "1.4.007"; var isBackground = false; var justResumed = false; @@ -1898,8 +1898,11 @@ angular.module('zmApp.controllers') insertSpecialTokens: function () { var tokens = ''; - var cid = loginData.zmNinjaCustomId.replace('%APPVER%', zmAppVersion); - tokens+='&id='+cid; + if (loginData.zmNinjaCustomId) { + var cid = loginData.zmNinjaCustomId.replace('%APPVER%', zmAppVersion); + tokens+='&id='+cid; + } + if (loginData.insertBasicAuthToken && $rootScope.basicAuthToken) { tokens += "&basicauth=" + $rootScope.basicAuthToken; } diff --git a/www/js/app.js b/www/js/app.js index 3dde24f1..26fef2fb 100755 --- a/www/js/app.js +++ b/www/js/app.js @@ -1520,7 +1520,7 @@ angular.module('zmApp', [ $rootScope.$on('$stateChangeStart', function (event, toState, toParams) { - if (!$rootScope.initComplete) { + if (!$rootScope.initComplete && toState.name!= 'app.first-use') { NVR.debug ("---> Init not complete, ignoring state change request to "+toState.name); event.preventDefault(); return; @@ -1832,6 +1832,7 @@ angular.module('zmApp', [ NVR.debug("isFirstUse returned: " + val); if (val == null || val == true) { NVR.log("First time detected "); + $rootScope.initComplete = true; $state.go("app.first-use"); return; |