@@ -419,7 +533,7 @@
@@ -564,31 +678,38 @@
}
);
- function login(e) {
+ function login(e) {
e.preventDefault();
- var button = this;
+
+ var signupBtn = document.getElementById('btn-signup');
+ if (!signupBtn.classList.contains('invisible')) {
+ signup.call(signupBtn);
+ return;
+ }
+
+ var button = document.getElementById('btn-login');
var username = document.getElementById('email').value;
var password = document.getElementById('password').value;
button.disabled = true;
var request = () => {
- webAuth.login({
+ webAuth.login({
realm: databaseConnection,
username: username,
password: password,
captcha: captcha.getValue()
- }, function(err) {
+ }, function(err) {
if (err) displayError(err);
button.disabled = false;
- });
+ });
};
if (triggerCaptcha) {
- triggerCaptcha(request);
+ triggerCaptcha(request);
} else {
- request();
+ request();
}
- }
+ }
function toggleSignupLogin(e) {
e.preventDefault();
@@ -744,6 +865,7 @@
}
}
+
document.getElementById('btn-login').addEventListener('click', login);
document.getElementById('btn-google').addEventListener('click', loginWithGoogle);
document.getElementById('btn-github').addEventListener('click', loginWithGithub);
@@ -753,7 +875,8 @@
document.getElementById('btn-signup').addEventListener('click', signup);
document.getElementById('link-signup-login').addEventListener('click', toggleSignupLogin);
document.getElementById('forgot-password-link').addEventListener('click', forgotPassword);
+ document.querySelector('form').addEventListener('submit', login);
});
-
