Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-07-14 20:12:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into v0.9.x

Browse Source
This commit is contained in:
Julian Lam
2015-11-06 17:41:11 -05:00
parent e911256c9c 7d03e9ae6b
commit 7945ae071b
4 changed files with 12 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -51,7 +51,7 @@
"nodebb-theme-lavender": "2.0.13",
"nodebb-theme-persona": "4.0.31",
"nodebb-theme-vanilla": "5.0.13",
"nodebb-widget-essentials": "2.0.3",
"nodebb-widget-essentials": "2.0.4",
"nodemailer": "0.7.1",
"npm": "^2.1.4",
"passport": "^0.3.0",

46
public/src/client/account/edit.js
View File

@@ -74,7 +74,10 @@ define('forum/account/edit', ['forum/account/header', 'uploader', 'translator'],
function handleImageChange() {
$('#changePictureBtn').on('click', function() {
socket.emit('user.getProfilePictures', function(err, pictures) {
socket.emit('user.getProfilePictures', {uid: ajaxify.data.uid}, function(err, pictures) {
if (err) {
return app.alertError(err.message);
}
templates.parse('partials/modals/change_picture_modal', {
pictures: pictures,
uploaded: !!ajaxify.data.uploadedpicture
@@ -115,13 +118,6 @@ define('forum/account/edit', ['forum/account/header', 'uploader', 'translator'],
}
})
}
// if (uploadedPicture) {
// modal.find('#user-uploaded-picture').attr('src', uploadedPicture);
// }
// modal.find('#uploaded-box').toggle(!!uploadedPicture);
// modal.find('#default-box .fa-check').toggle(currentPicture !== uploadedPicture);
// modal.find('#uploaded-box .fa-check').toggle(currentPicture === uploadedPicture);
}
function selectImageType() {
@@ -141,40 +137,6 @@ define('forum/account/edit', ['forum/account/header', 'uploader', 'translator'],
ajaxify.refresh();
});
}
// var modal = $(html);
// modal.on('hidden.bs.modal', function() {
// modal.remove();
// });
// selectedImageType = '';
// updateImages();
// modal.modal('show');
// modal.find('#default-box').on('click', function() {
// selectImageType('default');
// });
// modal.find('#uploaded-box').on('click', function() {
// selectImageType('uploaded');
// });
// modal.find('#savePictureChangesBtn').on('click', function() {
// modal.modal('hide');
// if (!selectedImageType) {
// return;
// }
// changeUserPicture(selectedImageType, function(err) {
// if (err) {
// return app.alertError(err.message);
// }
// updateHeader(selectedImageType === 'uploaded' ? uploadedPicture : '');
// ajaxify.refresh();
// });
// });
});
});
});

8
src/socket.io/user/picture.js
View File

@@ -100,12 +100,16 @@ module.exports = function(SocketUser) {
};
SocketUser.getProfilePictures = function(socket, data, callback) {
if (!data || !data.uid) {
return callback(new Error('[[error:invalid-data]]'));
}
async.parallel({
list: async.apply(plugins.fireHook, 'filter:user.listPictures', {
uid: socket.uid,
uid: data.uid,
pictures: []
}),
uploaded: async.apply(user.getUserField, socket.uid, 'uploadedpicture')
uploaded: async.apply(user.getUserField, data.uid, 'uploadedpicture')
}, function(err, data) {
if (err) {
return callback(err);

2
src/upgrade.js
View File

@@ -536,7 +536,7 @@ Upgrade.upgrade = function(callback) {
if (err) {
return next(err);
}
console.log('deleting gravatar for uid ', uid);
if (!userData.picture || !userData.gravatarpicture) {
return next();
}