From 94d9ab6b5857cc5638f07155a6b45403dbc468bf Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sun, 6 Nov 2016 09:53:50 +1300 Subject: Make login flow nicer --- web/app/view/LoginController.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'web/app/view') diff --git a/web/app/view/LoginController.js b/web/app/view/LoginController.js index e175c0c..fbc703e 100644 --- a/web/app/view/LoginController.js +++ b/web/app/view/LoginController.js @@ -32,14 +32,15 @@ Ext.define('Traccar.view.LoginController', { login: function () { var form = this.lookupReference('form'); if (form.isValid()) { - Ext.getBody().mask(Strings.sharedLoading); + Ext.get('spinner').setVisible(true); + this.getView().setVisible(false); Ext.Ajax.request({ scope: this, method: 'POST', url: 'api/session', params: form.getValues(), callback: function (options, success, response) { - Ext.getBody().unmask(); + Ext.get('spinner').setVisible(false); if (success) { if (this.lookupReference('rememberField').getValue()) { Ext.util.Cookies.set('user', this.lookupReference('userField').getValue(), Ext.Date.add(new Date(), Ext.Date.YEAR, 1)); @@ -48,6 +49,7 @@ Ext.define('Traccar.view.LoginController', { Traccar.app.setUser(Ext.decode(response.responseText)); this.fireViewEvent('login'); } else { + this.getView().setVisible(true); Traccar.app.showError(Strings.loginFailed); } } -- cgit v1.2.3