merged.. conflicted up the ass. registration looks gud again
psychobunny
12 years ago
commit
bb8f75b4be
@ -1,161 +1,151 @@
|
|||||||
(function() {
|
(function() {
|
||||||
var username = document.getElementById('username'),
|
var username = $('#username'),
|
||||||
password = document.getElementById('password'),
|
password = $('#password'),
|
||||||
password_confirm = document.getElementById('password-confirm'),
|
password_confirm = $('#password-confirm'),
|
||||||
register = document.getElementById('register'),
|
register = $('#register'),
|
||||||
emailEl = document.getElementById('email'),
|
emailEl = $('#email'),
|
||||||
username_notify = document.getElementById('username-notify'),
|
username_notify = $('#username-notify'),
|
||||||
email_notify = document.getElementById('email-notify'),
|
email_notify = $('#email-notify'),
|
||||||
password_notify = document.getElementById('password-notify'),
|
password_notify = $('#password-notify'),
|
||||||
password_confirm_notify = document.getElementById('password-confirm-notify'),
|
password_confirm_notify = $('#password-confirm-notify'),
|
||||||
usernamevalid = false;
|
validationError = false,
|
||||||
emailexists = false,
|
successIcon = '<i class="icon icon-ok"></i>';
|
||||||
emailvalid = false,
|
|
||||||
userexists = false,
|
function showError(element, msg) {
|
||||||
passwordsmatch = false,
|
element.html(msg);
|
||||||
passwordvalid = false;
|
element.parent().removeClass('alert-success').addClass('alert-danger');
|
||||||
|
element.show();
|
||||||
$(username).on('keyup change', function() {
|
validationError = true;
|
||||||
usernamevalid = utils.isUserNameValid(username.value);
|
}
|
||||||
|
|
||||||
|
function showSuccess(element, msg) {
|
||||||
if(username.value.length < 3) {
|
element.html(msg);
|
||||||
username_notify.innerHTML = 'Username too short';
|
element.parent().removeClass('alert-danger').addClass('alert-success');
|
||||||
username_notify.parentNode.className = 'input-group-addon btn-warning label-warning';
|
element.show();
|
||||||
} else if(username.value.length > 13) {
|
}
|
||||||
username_notify.innerHTML = 'Username too long';
|
|
||||||
username_notify.parentNode.className = 'input-group-addon btn-warning label-warning';
|
function validateEmail() {
|
||||||
} else if(!usernamevalid) {
|
if(!emailEl.val()) {
|
||||||
username_notify.innerHTML = 'Invalid username';
|
validationError = true;
|
||||||
username_notify.parentNode.className = 'input-group-addon btn-warning label-warning';
|
//email_notify.hide();
|
||||||
} else {
|
return;
|
||||||
socket.emit('user.exists', {username: username.value});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(!utils.isEmailValid(emailEl.val())) {
|
||||||
|
showError(email_notify, 'Invalid email address.');
|
||||||
|
}
|
||||||
|
else
|
||||||
|
socket.emit('user.email.exists', { email: emailEl.val() });
|
||||||
|
}
|
||||||
|
|
||||||
|
emailEl.on('blur', function() {
|
||||||
|
validateEmail();
|
||||||
});
|
});
|
||||||
|
|
||||||
$(emailEl).on('keyup change', function() {
|
function validateUsername() {
|
||||||
emailvalid = utils.isEmailValid(email.value);
|
if(!username.val()) {
|
||||||
|
validationError = true;
|
||||||
|
//username_notify.hide();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if(!emailvalid) {
|
if(username.val().length < config.minimumUsernameLength) {
|
||||||
email_notify.innerHTML = 'Invalid email address';
|
showError(username_notify, 'Username too short!');
|
||||||
email_notify.parentNode.className = 'input-group-addon btn-warning label-warning';
|
} else if(username.val().length > config.maximumUsernameLength) {
|
||||||
|
showError(username_notify, 'Username too long!');
|
||||||
|
} else if(!utils.isUserNameValid(username.val())) {
|
||||||
|
showError(username_notify, 'Invalid username!');
|
||||||
|
} else {
|
||||||
|
socket.emit('user.exists', {username: username.val()});
|
||||||
}
|
}
|
||||||
else
|
}
|
||||||
socket.emit('user.email.exists', { email: emailEl.value });
|
|
||||||
|
username.on('keyup', function() {
|
||||||
|
jQuery('#yourUsername').html(this.value.length > 0 ? this.value : 'username');
|
||||||
});
|
});
|
||||||
|
username.on('blur', function() {
|
||||||
$(password).on('keyup', function() {
|
validateUsername();
|
||||||
passwordvalid = utils.isPasswordValid(password.value);
|
});
|
||||||
if (password.value.length < 6) {
|
|
||||||
password_notify.innerHTML = 'Password too short';
|
function validatePassword() {
|
||||||
password_notify.parentNode.className = 'input-group-addon btn-warning label-warning';
|
if(!password.val()){
|
||||||
} else if(!passwordvalid) {
|
validationError = true;
|
||||||
password_notify.innerHTML = 'Invalid password';
|
//password_notify.hide();
|
||||||
password_notify.parentNode.className = 'input-group-addon btn-warning label-warning';
|
return;
|
||||||
} else {
|
|
||||||
password_notify.innerHTML = '<i class="icon icon-ok"></i>';
|
|
||||||
password_notify.parentNode.className = 'input-group-addon btn-success label-success';
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if(password.value !== password_confirm.value && password_confirm.value.length > 0) {
|
if (password.val().length < config.minimumPasswordLength) {
|
||||||
password_confirm_notify.innerHTML = 'Passwords must match!';
|
showError(password_notify, 'Password too short!');
|
||||||
password_confirm_notify.parentNode.className = 'input-group-addon btn-warning label-warning';
|
} else if(password.val().length > config.maximumPasswordLength) {
|
||||||
passwordsmatch = false;
|
showError(password_notify, 'Password too long!');
|
||||||
} else if (password.value === password_confirm.value && password_confirm.value.length > 0) {
|
} else if(!utils.isPasswordValid(password.val())) {
|
||||||
password_confirm_notify.innerHTML = '<i class="icon icon-ok"></i>';
|
showError(password_notify, 'Invalid password!');
|
||||||
password_confirm_notify.parentNode.className = 'input-group-addon btn-success label-success';
|
} else {
|
||||||
passwordsmatch = true;
|
showSuccess(password_notify, successIcon);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(password.val() !== password_confirm.val() && password_confirm.val() !== '') {
|
||||||
|
showError(password_confirm_notify, 'Passwords must match!');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$(password).on('blur', function() {
|
||||||
|
validatePassword();
|
||||||
});
|
});
|
||||||
|
|
||||||
$(password_confirm).on('keyup', function() {
|
function validatePasswordConfirm() {
|
||||||
if(password.value !== password_confirm.value) {
|
if(!password.val() || password_notify.hasClass('alert-error')) {
|
||||||
password_confirm_notify.innerHTML = 'Passwords must match!';
|
//password_confirm_notify.hide();
|
||||||
password_confirm_notify.parentNode.className = 'input-group-addon btn-warning label-warning';
|
return;
|
||||||
passwordsmatch = false;
|
|
||||||
}
|
}
|
||||||
else {
|
|
||||||
password_confirm_notify.innerHTML = '<i class="icon icon-ok"></i>';
|
if(password.val() !== password_confirm.val()) {
|
||||||
password_confirm_notify.parentNode.className = 'input-group-addon btn-success label-success';
|
showError(password_confirm_notify, 'Passwords must match!');
|
||||||
passwordsmatch = true;
|
} else {
|
||||||
|
showSuccess(password_confirm_notify, successIcon);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$(password_confirm).on('blur', function() {
|
||||||
|
validatePasswordConfirm();
|
||||||
});
|
});
|
||||||
|
|
||||||
ajaxify.register_events(['user.exists', 'user.email.exists']);
|
ajaxify.register_events(['user.exists', 'user.email.exists']);
|
||||||
|
|
||||||
socket.on('user.exists', function(data) {
|
socket.on('user.exists', function(data) {
|
||||||
userexists = data.exists;
|
|
||||||
if (data.exists === true) {
|
if (data.exists === true) {
|
||||||
username_notify.innerHTML = 'Username exists';
|
showError(username_notify, 'Username already taken!');
|
||||||
username_notify.parentNode.className = 'input-group-addon btn-warning label-warning';
|
|
||||||
} else {
|
} else {
|
||||||
username_notify.innerHTML = '<i class="icon icon-ok"></i>';
|
showSuccess(username_notify, successIcon);
|
||||||
username_notify.parentNode.className = 'input-group-addon btn-success label-success';
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
socket.on('user.email.exists', function(data) {
|
|
||||||
emailexists = data.exists;
|
|
||||||
|
|
||||||
|
socket.on('user.email.exists', function(data) {
|
||||||
if (data.exists === true) {
|
if (data.exists === true) {
|
||||||
email_notify.innerHTML = 'Email Address exists';
|
showError(email_notify, 'Email address already taken!');
|
||||||
email_notify.className = 'label label-warning';
|
} else {
|
||||||
}
|
showSuccess(email_notify, successIcon);
|
||||||
else {
|
|
||||||
email_notify.innerHTML = '<i class="icon icon-ok"></i>';
|
|
||||||
email_notify.parentNode.className = 'input-group-addon btn-success label-success';
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
// Alternate Logins
|
// Alternate Logins
|
||||||
var altLoginEl = document.querySelector('.alt-logins');
|
$('.alt-logins li').on('click', function(e) {
|
||||||
altLoginEl.addEventListener('click', function(e) {
|
document.location.href = $(this).attr('data-url');
|
||||||
var target;
|
|
||||||
switch(e.target.nodeName) {
|
|
||||||
case 'LI': target = e.target; break;
|
|
||||||
case 'I': target = e.target.parentNode; break;
|
|
||||||
}
|
|
||||||
if (target) {
|
|
||||||
document.location.href = target.getAttribute('data-url');
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
|
|
||||||
function validateForm() {
|
function validateForm() {
|
||||||
var validated = true;
|
validationError = false;
|
||||||
|
|
||||||
if (username.value.length < 2 || !usernamevalid) {
|
|
||||||
username_notify.innerHTML = 'Invalid username';
|
|
||||||
username_notify.className = 'label label-warning';
|
|
||||||
validated = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (password.value.length < 5) {
|
validateEmail();
|
||||||
password_notify.innerHTML = 'Password too short';
|
validateUsername();
|
||||||
validated = false;
|
validatePassword();
|
||||||
}
|
validatePasswordConfirm();
|
||||||
|
|
||||||
if(password.value !== password_confirm.value) {
|
|
||||||
password_confirm_notify.innerHTML = 'Passwords must match!';
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!emailvalid) {
|
return validationError;
|
||||||
email_notify.innerHTML = 'Invalid email address';
|
}
|
||||||
validated = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(emailexists) {
|
|
||||||
email_notify.innerHTML = 'Email Address exists';
|
|
||||||
validated = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(userexists || !passwordsmatch || !passwordvalid)
|
register.on('click', function(e) {
|
||||||
validated = false;
|
if (validateForm()) e.preventDefault();
|
||||||
|
});
|
||||||
|
|
||||||
return validated;
|
}());
|
||||||
}
|
|
||||||
|
|
||||||
register.addEventListener('click', function(e) {
|
|
||||||
if (!validateForm()) e.preventDefault();
|
|
||||||
}, false);
|
|
||||||
|
|
||||||
}());
|
|
||||||
Loading…
Reference in New Issue