diff options
| -rw-r--r-- | jsconfig.json | 7 | ||||
| -rw-r--r-- | package.json | 4 | ||||
| -rw-r--r-- | www/js/LoginCtrl.js | 3 | ||||
| -rw-r--r-- | www/js/MenuController.js | 4 |
4 files changed, 13 insertions, 5 deletions
diff --git a/jsconfig.json b/jsconfig.json index 0000ef3d..bccb75f0 100644 --- a/jsconfig.json +++ b/jsconfig.json @@ -1,10 +1,11 @@ { "include": [ "www/**/*" + ], "exclude": [ - "node_modules", - "dist", - "platforms" + "node_modules/**/*", + "dist/**/*", + "platforms/**/*" ] }
\ No newline at end of file diff --git a/package.json b/package.json index 7a53f69e..8f653b45 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "zmninjapro", "description": "Home security mobile app for ZoneMinder", - "version":"1.3.018", + "version": "1.3.018", "displayName": "zmNinja", "author": "Pliable Pixels", "license": "custom see LICENSE.md", @@ -181,4 +181,4 @@ ] } } -} +}
\ No newline at end of file diff --git a/www/js/LoginCtrl.js b/www/js/LoginCtrl.js index 923e1baa..782bcd72 100644 --- a/www/js/LoginCtrl.js +++ b/www/js/LoginCtrl.js @@ -461,6 +461,7 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r $rootScope.alarmCount = 0; $rootScope.isAlarm = false; + $rootScope.newBlogPost = ''; NVRDataModel.setFirstUse(false); NVRDataModel.setCurrentServerVersion(''); @@ -577,6 +578,8 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r NVRDataModel.setLogin($scope.loginData); + $rootScope.authSession = ''; + if ($rootScope.platformOS != 'desktop') { if ($scope.loginData.saveToCloud) { diff --git a/www/js/MenuController.js b/www/js/MenuController.js index abe2e80c..995abba3 100644 --- a/www/js/MenuController.js +++ b/www/js/MenuController.js @@ -49,6 +49,8 @@ angular.module('zmApp.controllers').controller('MenuController', ['$scope', '$io $rootScope.alarmCount = 0; $rootScope.isAlarm = false; + $rootScope.authSession = ''; + @@ -69,6 +71,8 @@ angular.module('zmApp.controllers').controller('MenuController', ['$scope', '$io NVRDataModel.debug("Retrieved state for this profile:" + JSON.stringify(loginData)); NVRDataModel.setLogin(loginData); + + if (!loginData.isUseBasicAuth) { $rootScope.basicAuthHeader = ''; $rootScope.basicAuthToken = ''; |