diff options
| author | Yoggzo <yogg@epsina.com> | 2016-03-08 17:30:26 +0100 |
|---|---|---|
| committer | Yoggzo <yogg@epsina.com> | 2016-03-08 17:30:26 +0100 |
| commit | 89f2c4ac8cd6b0f7766170d588eae2407124f8fc (patch) | |
| tree | 6275b180b1c1f45caba3e84437119f784f5ebfba /client/js/controllers/login.js | |
| parent | 66baa3ffc8bd119558eeb1e87cb05c6008df9d6f (diff) | |
| parent | 3b569b6d008d5b1936ee04948cf5c1cc08790f39 (diff) | |
Merge branch 'develop' into Evan
Diffstat (limited to 'client/js/controllers/login.js')
| -rw-r--r-- | client/js/controllers/login.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/client/js/controllers/login.js b/client/js/controllers/login.js index 1a89563..63cb6d1 100644 --- a/client/js/controllers/login.js +++ b/client/js/controllers/login.js @@ -16,10 +16,11 @@ mainApp.controller('loginCtrl', ['$scope','$sce','Identity', function ($scope,$s // Manager logout event $scope.$on('logoutEvent', function(){ - Identity.logout(); $('#loginModal').modal({backdrop: 'static', keyboard: false}); }); + + // Hide loading button and message alert $('#loadingLoginButton').hide(); $('#failedToLoginAlert').hide(); |