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

fixed user avatar modal again

Browse Source
v1.18.x
Julian Lam 10 years ago
parent 8bf1b3e6a4
commit 5c71bb5923
2 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File

37
public/src/client/account/edit.js
Unescape Escape View File

@ -4,13 +4,11 @@
define('forum/account/edit', ['forum/account/header', 'uploader', 'translator'], function(header, uploader, translator) { define('forum/account/edit', ['forum/account/header', 'uploader', 'translator'], function(header, uploader, translator) {
var AccountEdit = {}, var AccountEdit = {},
gravatarPicture = '',
uploadedPicture = '', uploadedPicture = '',
selectedImageType = '', selectedImageType = '',
currentEmail; currentEmail;
AccountEdit.init = function() { AccountEdit.init = function() {
gravatarPicture = ajaxify.data.gravatarpicture;
uploadedPicture = ajaxify.data.uploadedpicture; uploadedPicture = ajaxify.data.uploadedpicture;
header.init(); header.init();
@ -59,11 +57,6 @@ define('forum/account/edit', ['forum/account/header', 'uploader', 'translator'],
$('#user-current-picture').attr('src', data.picture); $('#user-current-picture').attr('src', data.picture);
} }
if (data.gravatarpicture) {
$('#user-gravatar-picture').attr('src', data.gravatarpicture);
gravatarPicture = data.gravatarpicture;
}
if (data.userslug) { if (data.userslug) {
var oldslug = $('.account-username-box').attr('data-userslug'); var oldslug = $('.account-username-box').attr('data-userslug');
$('.account-username-box a').each(function() { $('.account-username-box a').each(function() {
@ -90,6 +83,8 @@ define('forum/account/edit', ['forum/account/header', 'uploader', 'translator'],
return; return;
} }
components.get('header/userpicture')[picture ? 'show' : 'hide']();
components.get('header/usericon')[!picture ? 'show' : 'hide']();
if (picture) { if (picture) {
components.get('header/userpicture').attr('src', picture); components.get('header/userpicture').attr('src', picture);
} }
@ -107,25 +102,26 @@ define('forum/account/edit', ['forum/account/header', 'uploader', 'translator'],
templates.parse('partials/modals/change_picture_modal', {uploadedpicture: uploadedPicture}, function(html) { templates.parse('partials/modals/change_picture_modal', {uploadedpicture: uploadedPicture}, function(html) {
translator.translate(html, function(html) { translator.translate(html, function(html) {
function updateImages() { function updateImages() {
var currentPicture = $('#user-current-picture').attr('src'); var currentPicture = $('#user-current-picture').attr('src'),
userIcon = modal.find('.user-icon');
if (gravatarPicture) { userIcon
modal.find('#user-gravatar-picture').attr('src', gravatarPicture); .css('background-color', ajaxify.data['icon:bgColor'])
} .text(ajaxify.data['icon:text']);
if (uploadedPicture) { if (uploadedPicture) {
console.log("DERP");
modal.find('#user-uploaded-picture').attr('src', uploadedPicture); modal.find('#user-uploaded-picture').attr('src', uploadedPicture);
} }
modal.find('#gravatar-box').toggle(!!gravatarPicture);
modal.find('#uploaded-box').toggle(!!uploadedPicture); modal.find('#uploaded-box').toggle(!!uploadedPicture);
modal.find('#gravatar-box .fa-check').toggle(currentPicture !== uploadedPicture); modal.find('#default-box .fa-check').toggle(currentPicture !== uploadedPicture);
modal.find('#uploaded-box .fa-check').toggle(currentPicture === uploadedPicture); modal.find('#uploaded-box .fa-check').toggle(currentPicture === uploadedPicture);
} }
function selectImageType(type) { function selectImageType(type) {
modal.find('#gravatar-box .fa-check').toggle(type === 'gravatar'); modal.find('#default-box .fa-check').toggle(type === 'default');
modal.find('#uploaded-box .fa-check').toggle(type === 'uploaded'); modal.find('#uploaded-box .fa-check').toggle(type === 'uploaded');
selectedImageType = type; selectedImageType = type;
} }
@ -139,8 +135,8 @@ define('forum/account/edit', ['forum/account/header', 'uploader', 'translator'],
modal.modal('show'); modal.modal('show');
modal.find('#gravatar-box').on('click', function() { modal.find('#default-box').on('click', function() {
selectImageType('gravatar'); selectImageType('default');
}); });
modal.find('#uploaded-box').on('click', function() { modal.find('#uploaded-box').on('click', function() {
@ -161,13 +157,8 @@ define('forum/account/edit', ['forum/account/header', 'uploader', 'translator'],
return app.alertError(err.message); return app.alertError(err.message);
} }
if (selectedImageType === 'gravatar') { updateHeader(selectedImageType === 'uploaded' ? uploadedPicture : '');
$('#user-current-picture').attr('src', gravatarPicture); ajaxify.refresh();
updateHeader(gravatarPicture);
} else if (selectedImageType === 'uploaded') {
$('#user-current-picture').attr('src', uploadedPicture);
updateHeader(uploadedPicture);
}
}); });
}); });
}); });

2
src/user/data.js
Unescape Escape View File

@ -106,6 +106,8 @@ module.exports = function(User) {
if (user.picture && user.picture === user.uploadedpicture) { if (user.picture && user.picture === user.uploadedpicture) {
user.picture = user.uploadedpicture = user.picture.startsWith('http') ? user.picture : nconf.get('relative_path') + user.picture; user.picture = user.uploadedpicture = user.picture.startsWith('http') ? user.picture : nconf.get('relative_path') + user.picture;
} else if (user.uploadedpicture) {
user.uploadedpicture = user.uploadedpicture.startsWith('http') ? user.uploadedpicture : nconf.get('relative_path') + user.uploadedpicture;
} }
for(var i=0; i<fieldsToRemove.length; ++i) { for(var i=0; i<fieldsToRemove.length; ++i) {

Write Preview
Loading…
Cancel
Save