hyperzlib
/
nodebb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

jshint and refactor accountedit

Browse Source
v1.18.x
barisusakli 11 years ago
parent 1e3b88a7f0
commit 7545d55b22
2 changed files with 155 additions and 164 deletions
Show Stats Download Patch File Download Diff File

1
public/language/en_GB/user.json
Unescape Escape View File

@ -23,6 +23,7 @@
"follow": "Follow",
"unfollow": "Unfollow",
"profile_update_success": "Profile has been updated successfully!",
"change_picture": "Change Picture",
"edit": "Edit",
"uploaded_picture": "Uploaded Picture",

160
public/src/forum/accountedit.js
Unescape Escape View File

@ -1,18 +1,28 @@
'use strict';
/* globals define, ajaxify, socket, app, config, utils, translator */
define(['forum/accountheader', 'uploader'], function(header, uploader) {
var AccountEdit = {},
gravatarPicture = '',
uploadedPicture = '';
uploadedPicture = '',
selectedImageType = '';
AccountEdit.init = function() {
header.init();
gravatarPicture = ajaxify.variables.get('gravatarpicture');
uploadedPicture = ajaxify.variables.get('uploadedpicture');
var selectedImageType = '';
header.init();
$('#submitBtn').on('click', function() {
$('#submitBtn').on('click', updateProfile);
handleImageChange();
handleImageUpload();
handlePasswordChange();
updateSignature();
};
function updateProfile() {
var userData = {
uid: $('#inputUID').val(),
username: $('#inputUsername').val(),
@ -25,15 +35,12 @@ define(['forum/accountheader', 'uploader'], function(header, uploader) {
};
socket.emit('user.updateProfile', userData, function(err, data) {
if(err) {
if (err) {
return app.alertError(err.message);
}
if (!data) {
return app.alertError('There was an error updating the profile!');
}
app.alertSuccess('[[user:profile_update_success]]');
app.alertSuccess('Profile has been updated successfully!');
if (data.picture) {
$('#user-current-picture').attr('src', data.picture);
$('#user_label img').attr('src', data.picture);
@ -44,7 +51,7 @@ define(['forum/accountheader', 'uploader'], function(header, uploader) {
gravatarPicture = data.gravatarpicture;
}
if(data.userslug) {
if (data.userslug) {
var oldslug = $('.account-username-box').attr('data-userslug');
$('.account-username-box a').each(function(index) {
$(this).attr('href', $(this).attr('href').replace(oldslug, data.userslug));
@ -56,27 +63,20 @@ define(['forum/accountheader', 'uploader'], function(header, uploader) {
$('#user-profile-link span').html(' ' + userData.username);
}
});
return false;
});
function getSignatureCharsLeft() {
if($('#inputSignature').length) {
return '(' + $('#inputSignature').val().length + '/' + config.maximumSignatureLength + ')';
} else {
return '';
}
return false;
}
$('#signatureCharCountLeft').html(getSignatureCharsLeft());
$('#inputSignature').on('keyup change', function(ev) {
$('#signatureCharCountLeft').html(getSignatureCharsLeft());
});
function handleImageChange() {
function selectImageType(type) {
$('#gravatar-box .fa-check').toggle(type === 'gravatar');
$('#uploaded-box .fa-check').toggle(type === 'uploaded');
selectedImageType = type;
}
$('#changePictureBtn').on('click', function() {
selectedImageType = '';
AccountEdit.updateImages();
updateImages();
$('#change-picture-modal').modal('show');
$('#change-picture-modal').removeClass('hide');
@ -85,31 +85,29 @@ define(['forum/accountheader', 'uploader'], function(header, uploader) {
});
$('#gravatar-box').on('click', function() {
$('#gravatar-box .fa-check').show();
$('#uploaded-box .fa-check').hide();
selectedImageType = 'gravatar';
selectImageType('gravatar');
});
$('#uploaded-box').on('click', function() {
$('#gravatar-box .fa-check').hide();
$('#uploaded-box .fa-check').show();
selectedImageType = 'uploaded';
selectImageType('uploaded');
});
$('#savePictureChangesBtn').on('click', function() {
$('#change-picture-modal').modal('hide');
if (selectedImageType) {
AccountEdit.changeUserPicture(selectedImageType);
changeUserPicture(selectedImageType);
if (selectedImageType == 'gravatar')
if (selectedImageType === 'gravatar') {
$('#user-current-picture').attr('src', gravatarPicture);
else if (selectedImageType == 'uploaded')
} else if (selectedImageType === 'uploaded') {
$('#user-current-picture').attr('src', uploadedPicture);
}
}
});
}
function handleImageUpload() {
$('#upload-picture-modal').on('hide', function() {
$('#userPhotoInput').val('');
});
@ -117,7 +115,7 @@ define(['forum/accountheader', 'uploader'], function(header, uploader) {
$('#uploadPictureBtn').on('click', function() {
$('#change-picture-modal').modal('hide');
uploader.open(RELATIVE_PATH + '/user/uploadpicture', {uid: ajaxify.variables.get('theirid')}, config.maximumProfileImageSize, function(imageUrlOnServer) {
uploader.open(config.relative_path + '/user/uploadpicture', {uid: ajaxify.variables.get('theirid')}, config.maximumProfileImageSize, function(imageUrlOnServer) {
imageUrlOnServer = imageUrlOnServer + '?' + new Date().getTime();
$('#user-current-picture').attr('src', imageUrlOnServer);
@ -130,32 +128,11 @@ define(['forum/accountheader', 'uploader'], function(header, uploader) {
}, app.updateHeader);
});
return false;
});
function showError(element, msg) {
translator.translate(msg, function(msg) {
element.html(msg);
element.parent()
.removeClass('alert-success')
.addClass('alert-danger');
element.show();
validationError = true;
});
}
function showSuccess(element, msg) {
translator.translate(msg, function(msg) {
element.html(msg);
element.parent()
.removeClass('alert-danger')
.addClass('alert-success');
element.show();
});
}
(function handlePasswordChange() {
function handlePasswordChange() {
var currentPassword = $('#inputCurrentPassword');
var password_notify = $('#password-notify');
var password_confirm_notify = $('#password-confirm-notify');
@ -165,7 +142,6 @@ define(['forum/accountheader', 'uploader'], function(header, uploader) {
var passwordsmatch = false;
var successIcon = '<i class="fa fa-check"></i>';
function onPasswordChanged() {
passwordvalid = utils.isPasswordValid(password.val());
if (password.val().length < config.minimumPasswordLength) {
@ -180,7 +156,7 @@ define(['forum/accountheader', 'uploader'], function(header, uploader) {
function onPasswordConfirmChanged() {
if(password.val()) {
if (password.val() !== password_confirm.val()) {
showError(password_confirm_notify, '[[user:change_password_error_match]]')
showError(password_confirm_notify, '[[user:change_password_error_match]]');
passwordsmatch = false;
} else {
showSuccess(password_confirm_notify, successIcon);
@ -214,53 +190,67 @@ define(['forum/accountheader', 'uploader'], function(header, uploader) {
}
return false;
});
}
}());
};
AccountEdit.changeUserPicture = function(type) {
var userData = {
function changeUserPicture(type) {
socket.emit('user.changePicture', {
type: type,
uid: ajaxify.variables.get('theirid')
};
socket.emit('user.changePicture', userData, function(err) {
}, function(err) {
if(err) {
app.alertError(err.message);
}
});
}
AccountEdit.updateImages = function() {
function updateImages() {
var currentPicture = $('#user-current-picture').attr('src');
if (gravatarPicture) {
$('#user-gravatar-picture').attr('src', gravatarPicture);
$('#gravatar-box').show();
} else {
$('#gravatar-box').hide();
}
if (uploadedPicture) {
$('#user-uploaded-picture').attr('src', uploadedPicture);
$('#uploaded-box').show();
} else {
$('#uploaded-box').hide();
}
$('#gravatar-box').toggle(!!gravatarPicture);
$('#uploaded-box').toggle(!!uploadedPicture);
if (currentPicture == gravatarPicture) {
$('#gravatar-box .fa-check').show();
} else {
$('#gravatar-box .fa-check').hide();
$('#gravatar-box .fa-check').toggle(currentPicture === gravatarPicture);
$('#uploaded-box .fa-check').toggle(currentPicture === uploadedPicture);
}
if (currentPicture == uploadedPicture) {
$('#uploaded-box .fa-check').show();
} else {
$('#uploaded-box .fa-check').hide();
function updateSignature() {
function getSignatureCharsLeft() {
return $('#inputSignature').length ? '(' + $('#inputSignature').val().length + '/' + config.maximumSignatureLength + ')' : '';
}
$('#signatureCharCountLeft').html(getSignatureCharsLeft());
$('#inputSignature').on('keyup change', function(ev) {
$('#signatureCharCountLeft').html(getSignatureCharsLeft());
});
}
function showError(element, msg) {
translator.translate(msg, function(msg) {
element.html(msg);
element.parent()
.removeClass('alert-success')
.addClass('alert-danger');
element.show();
});
}
function showSuccess(element, msg) {
translator.translate(msg, function(msg) {
element.html(msg);
element.parent()
.removeClass('alert-danger')
.addClass('alert-success');
element.show();
});
}
return AccountEdit;

Write Preview
Loading…
Cancel
Save