diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2016-07-04 17:27:18 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2016-07-04 17:27:18 -0400 |
| commit | 84b05d931168df5eade1a5ca3c9dc0b303d98384 (patch) | |
| tree | cab6a17d9f2f1eea4d6114a545759c05d9bb1851 /www/js/LoginCtrl.js | |
| parent | c841472fd5b2b6cf038cfde02283239166f3b0a1 (diff) | |
#278 - go directly to live view via monitors (avoid packery jugglery in montage). Pending - set value of tappedMid
Former-commit-id: 7805e086656ae4f05ee4af97d325f0e2b87f999a
Diffstat (limited to 'www/js/LoginCtrl.js')
| -rw-r--r-- | www/js/LoginCtrl.js | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/www/js/LoginCtrl.js b/www/js/LoginCtrl.js index 63ac65e0..e67867fe 100644 --- a/www/js/LoginCtrl.js +++ b/www/js/LoginCtrl.js @@ -14,11 +14,11 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r $scope.loginData = ZMDataModel.getLogin(); $scope.check = { - isUseAuth: "", - isUseEventServer: "" + isUseAuth: false, + isUseEventServer: false }; - $scope.check.isUseAuth = ($scope.loginData.isUseAuth == '1') ? true : false; + $scope.check.isUseAuth = ($scope.loginData.isUseAuth ) ? true : false; $scope.check.isUseEventServer = ($scope.loginData.isUseEventServer == true) ? true : false; //---------------------------------------------------------------- @@ -108,7 +108,7 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r console.log ("NEW LOGIN OBJECT IS " + JSON.stringify($scope.loginData)); - $scope.check.isUseAuth = ($scope.loginData.isUseAuth == '1') ? true : false; + $scope.check.isUseAuth = ($scope.loginData.isUseAuth) ? true : false; $scope.check.isUseEventServer = ($scope.loginData.isUseEventServer == true) ? true : false; ZMDataModel.zmDebug("Retrieved state for this profile:" + JSON.stringify($scope.loginData)); @@ -217,11 +217,17 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r { $scope.loginData.username = $rootScope.wizard.zmuser; $scope.loginData.password = $rootScope.wizard.zmpassword; - if ((/^https:\/\//i.test($scope.loginData.url))) - { - $scope.loginData.useSSL = true; - } } + else + { + $scope.loginData.isUseAuth = false; + } + + if ((/^https:\/\//i.test($scope.loginData.url))) + { + $scope.loginData.useSSL = true; + } + } @@ -385,7 +391,7 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r - $scope.loginData.isUseAuth = ($scope.check.isUseAuth) ? "1" : "0"; + $scope.loginData.isUseAuth = ($scope.check.isUseAuth) ? true:false; $scope.loginData.isUseEventServer = ($scope.check.isUseEventServer) ? true : false; if ($scope.loginData.url.slice(-1) == '/') { |