diff options
| author | manzerbredes <loic.guegan_secondary@yahoo.fr> | 2016-03-02 21:03:25 +0100 |
|---|---|---|
| committer | manzerbredes <loic.guegan_secondary@yahoo.fr> | 2016-03-02 21:03:25 +0100 |
| commit | dde482df6492e874ffb30c3c5127e620c418c57b (patch) | |
| tree | c140423cc3d396a8a3507496b392894cbe47fecf /client/js/controllers/login.js | |
| parent | 6ce1bbc7be91aa6441c3ff168a734ed25479eb72 (diff) | |
| parent | 85222e1246b3805100428717874d15aafd682d26 (diff) | |
Correct conflicts
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(); |