From bb2636b3f3c669d1f6dcbc891c7770bb12fa26f1 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Wed, 30 Sep 2015 18:30:01 +0200 Subject: Fix indentation in login.js --- js/codeq/login.js | 58 +++++++++++++++++++++++++++---------------------------- 1 file 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 +})(); -- cgit v1.2.1 From 5ad56dfc6e8ababaa61c69265a30a95a7772e995 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Wed, 30 Sep 2015 18:32:05 +0200 Subject: Submit login form on enter key --- js/codeq/login.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/js/codeq/login.js b/js/codeq/login.js index 6f9a7e7..7db2c8c 100644 --- a/js/codeq/login.js +++ b/js/codeq/login.js @@ -33,11 +33,18 @@ $('#disabled').css('display', 'none'); }) .done(); - }; + }, + formInputs = $('#username').add('#password'); + codeq.globalStateMachine.register('login',{ 'enter': function(){ $('#signed-in-title').html(''); $("#submit").on('click', loginFun); + formInputs.on('keyup', function (ev) { + if ((ev.keyCode || ev.which) == 13) { + $('#submit').trigger('click'); + } + }); $('#modalLogIn').modal(); $("#screen_login").css('display', ''); @@ -45,6 +52,7 @@ }, 'exit' : function(){ $("#submit").off('click', loginFun); + formInputs.off('keyup'); $("#screen_login").css('display', 'none'); $('#signed-in-title').html('Signed in as '+$('#username').val()); $("#password").val(''); -- cgit v1.2.1