diff options
| author | pliablepixels <pliablepixels@gmail.com> | 2016-02-02 11:12:51 -0500 |
|---|---|---|
| committer | pliablepixels <pliablepixels@gmail.com> | 2016-02-02 11:12:51 -0500 |
| commit | 266189e452ca2591ef06b2038e6890f3353e703a (patch) | |
| tree | 66ed8cdd7e235629fd0005fef029b139b46eba0c /www/js/LoginCtrl.js | |
| parent | 1643d47c2a4e946012455f5702b92e8402bb46a2 (diff) | |
#135 - various changes and cleanup
Former-commit-id: 116d0c81481427115de9fade8f89f1e1a3ac08df
Diffstat (limited to 'www/js/LoginCtrl.js')
| -rw-r--r-- | www/js/LoginCtrl.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/www/js/LoginCtrl.js b/www/js/LoginCtrl.js index 4feb5da7..d6a41a9f 100644 --- a/www/js/LoginCtrl.js +++ b/www/js/LoginCtrl.js @@ -37,7 +37,7 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r }; $scope.check.isUseAuth = ($scope.loginData.isUseAuth == '1') ? true : false; - $scope.check.isUseEventServer = ($scope.loginData.isUseEventServer == '1') ? true : false; + $scope.check.isUseEventServer = ($scope.loginData.isUseEventServer == true) ? true : false; console.log("*************************************************"); @@ -76,7 +76,7 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r $scope.check.isUseAuth = ($scope.loginData.isUseAuth == '1') ? true : false; - $scope.check.isUseEventServer = ($scope.loginData.isUseEventServer == '1') ? true : false; + $scope.check.isUseEventServer = ($scope.loginData.isUseEventServer == true) ? true : false; ZMDataModel.zmDebug("Retrieved state for this profile:" + JSON.stringify($scope.loginData)); @@ -301,7 +301,7 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r $scope.loginData.isUseAuth = ($scope.check.isUseAuth) ? "1" : "0"; - $scope.loginData.isUseEventServer = ($scope.check.isUseEventServer) ? "1" : "0"; + $scope.loginData.isUseEventServer = ($scope.check.isUseEventServer) ? true : false; if ($scope.loginData.url.slice(-1) == '/') { $scope.loginData.url = $scope.loginData.url.slice(0, -1); @@ -389,7 +389,7 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r if ($scope.check.isUseEventServer) { EventServer.init(); - if ($rootScope.apnsToken && $scope.loginData.disablePush != '1') { + if ($rootScope.apnsToken && $scope.loginData.disablePush != true) { ZMDataModel.zmLog("Making sure we get push notifications"); EventServer.sendMessage('push', { type: 'token', |