diff options
Diffstat (limited to 'js')
| -rw-r--r-- | js/codeq/login.js | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/js/codeq/login.js b/js/codeq/login.js index 7844dc4..6f9a7e7 100644 --- a/js/codeq/login.js +++ b/js/codeq/login.js @@ -4,36 +4,36 @@ (function(){ var loginFun = function(){ - $('#disabled').css('display', ''); - $('#disabled').css('cursor', 'wait'); - codeq.comms.connect() - .then(function () { - return codeq.comms.login($('#username').val(), $('#password').val()); - }) - .then(function (data) { - $('#disabled').css('display', 'none'); - $('#disabled').css('cursor', ''); - if (data.code !== 0) throw new Error('Login failed, code: ' + data.code + ', message: ' + data.message); + $('#disabled').css('display', ''); + $('#disabled').css('cursor', 'wait'); + codeq.comms.connect() + .then(function () { + return codeq.comms.login($('#username').val(), $('#password').val()); + }) + .then(function (data) { + $('#disabled').css('display', 'none'); + $('#disabled').css('cursor', ''); + if (data.code !== 0) throw new Error('Login failed, code: ' + data.code + ', message: ' + data.message); - //merge these settings into the already existing default settings - var sett = data.settings; - $.merge(true, codeq.settings, sett); - if('lan' in sett && sett['lan'] in codeq.supportedLangs){ - codeq.setLang(sett['lan']); - } + //merge these settings into the already existing default settings + var sett = data.settings; + $.merge(true, codeq.settings, sett); + if('lan' in sett && sett['lan'] in codeq.supportedLangs){ + codeq.setLang(sett['lan']); + } - codeq.globalStateMachine.transition('language'); - //codeq.activateState('language'); - }) - .fail(function (reason) { - $('#disabled').css('display', 'none'); - $('#disabled').css('cursor', ''); - codeq.log.error('Login failed: ' + reason, reason); - alert('Login request failed: ' + reason); - $('#disabled').css('display', 'none'); - }) - .done(); - }; + codeq.globalStateMachine.transition('language'); + //codeq.activateState('language'); + }) + .fail(function (reason) { + $('#disabled').css('display', 'none'); + $('#disabled').css('cursor', ''); + codeq.log.error('Login failed: ' + reason, reason); + alert('Login request failed: ' + reason); + $('#disabled').css('display', 'none'); + }) + .done(); + }; codeq.globalStateMachine.register('login',{ 'enter': function(){ $('#signed-in-title').html(''); @@ -50,4 +50,4 @@ $("#password").val(''); } }); -})();
\ No newline at end of file +})(); |