|
|
|
@ -88,70 +88,68 @@ define('forum/account/edit', [
|
|
|
|
return memo || cur.type === 'uploaded';
|
|
|
|
return memo || cur.type === 'uploaded';
|
|
|
|
}, false);
|
|
|
|
}, false);
|
|
|
|
|
|
|
|
|
|
|
|
Benchpress.parse('partials/modals/change_picture_modal', {
|
|
|
|
app.parseAndTranslate('partials/modals/change_picture_modal', {
|
|
|
|
pictures: pictures,
|
|
|
|
pictures: pictures,
|
|
|
|
uploaded: uploaded,
|
|
|
|
uploaded: uploaded,
|
|
|
|
icon: { text: ajaxify.data['icon:text'], bgColor: ajaxify.data['icon:bgColor'] },
|
|
|
|
icon: { text: ajaxify.data['icon:text'], bgColor: ajaxify.data['icon:bgColor'] },
|
|
|
|
defaultAvatar: ajaxify.data.defaultAvatar,
|
|
|
|
defaultAvatar: ajaxify.data.defaultAvatar,
|
|
|
|
allowProfileImageUploads: ajaxify.data.allowProfileImageUploads,
|
|
|
|
allowProfileImageUploads: ajaxify.data.allowProfileImageUploads,
|
|
|
|
}, function (html) {
|
|
|
|
}, function (html) {
|
|
|
|
translator.translate(html, function (html) {
|
|
|
|
var modal = bootbox.dialog({
|
|
|
|
var modal = bootbox.dialog({
|
|
|
|
className: 'picture-switcher',
|
|
|
|
className: 'picture-switcher',
|
|
|
|
title: '[[user:change_picture]]',
|
|
|
|
title: '[[user:change_picture]]',
|
|
|
|
message: html,
|
|
|
|
message: html,
|
|
|
|
show: true,
|
|
|
|
show: true,
|
|
|
|
buttons: {
|
|
|
|
buttons: {
|
|
|
|
close: {
|
|
|
|
close: {
|
|
|
|
label: '[[global:close]]',
|
|
|
|
label: '[[global:close]]',
|
|
|
|
callback: onCloseModal,
|
|
|
|
callback: onCloseModal,
|
|
|
|
className: 'btn-link',
|
|
|
|
className: 'btn-link',
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
update: {
|
|
|
|
|
|
|
|
label: '[[global:save_changes]]',
|
|
|
|
|
|
|
|
callback: saveSelection,
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
},
|
|
|
|
},
|
|
|
|
});
|
|
|
|
update: {
|
|
|
|
|
|
|
|
label: '[[global:save_changes]]',
|
|
|
|
modal.on('shown.bs.modal', updateImages);
|
|
|
|
callback: saveSelection,
|
|
|
|
modal.on('click', '.list-group-item', function selectImageType() {
|
|
|
|
},
|
|
|
|
modal.find('.list-group-item').removeClass('active');
|
|
|
|
},
|
|
|
|
$(this).addClass('active');
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
handleImageUpload(modal);
|
|
|
|
modal.on('shown.bs.modal', updateImages);
|
|
|
|
|
|
|
|
modal.on('click', '.list-group-item', function selectImageType() {
|
|
|
|
function updateImages() {
|
|
|
|
modal.find('.list-group-item').removeClass('active');
|
|
|
|
// Check to see which one is the active picture
|
|
|
|
$(this).addClass('active');
|
|
|
|
if (!ajaxify.data.picture) {
|
|
|
|
});
|
|
|
|
modal.find('.list-group-item .user-icon').parents('.list-group-item').addClass('active');
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
modal.find('.list-group-item img').each(function () {
|
|
|
|
|
|
|
|
if (this.getAttribute('src') === ajaxify.data.picture) {
|
|
|
|
|
|
|
|
$(this).parents('.list-group-item').addClass('active');
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
function saveSelection() {
|
|
|
|
handleImageUpload(modal);
|
|
|
|
var type = modal.find('.list-group-item.active').attr('data-type');
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
changeUserPicture(type, function (err) {
|
|
|
|
function updateImages() {
|
|
|
|
if (err) {
|
|
|
|
// Check to see which one is the active picture
|
|
|
|
return app.alertError(err.message);
|
|
|
|
if (!ajaxify.data.picture) {
|
|
|
|
|
|
|
|
modal.find('.list-group-item .user-icon').parents('.list-group-item').addClass('active');
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
modal.find('.list-group-item img').each(function () {
|
|
|
|
|
|
|
|
if (this.getAttribute('src') === ajaxify.data.picture) {
|
|
|
|
|
|
|
|
$(this).parents('.list-group-item').addClass('active');
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
updateHeader(type === 'default' ? '' : modal.find('.list-group-item.active img').attr('src'));
|
|
|
|
|
|
|
|
ajaxify.refresh();
|
|
|
|
|
|
|
|
});
|
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
function onCloseModal() {
|
|
|
|
function saveSelection() {
|
|
|
|
modal.modal('hide');
|
|
|
|
var type = modal.find('.list-group-item.active').attr('data-type');
|
|
|
|
}
|
|
|
|
|
|
|
|
});
|
|
|
|
changeUserPicture(type, function (err) {
|
|
|
|
|
|
|
|
if (err) {
|
|
|
|
|
|
|
|
return app.alertError(err.message);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
updateHeader(type === 'default' ? '' : modal.find('.list-group-item.active img').attr('src'));
|
|
|
|
|
|
|
|
ajaxify.refresh();
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
function onCloseModal() {
|
|
|
|
|
|
|
|
modal.modal('hide');
|
|
|
|
|
|
|
|
}
|
|
|
|
});
|
|
|
|
});
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
|
|
@ -247,30 +245,28 @@ define('forum/account/edit', [
|
|
|
|
|
|
|
|
|
|
|
|
modal.find('[data-action="upload-url"]').on('click', function () {
|
|
|
|
modal.find('[data-action="upload-url"]').on('click', function () {
|
|
|
|
modal.modal('hide');
|
|
|
|
modal.modal('hide');
|
|
|
|
Benchpress.parse('partials/modals/upload_picture_from_url_modal', {}, function (html) {
|
|
|
|
app.parseAndTranslate('partials/modals/upload_picture_from_url_modal', {}, function (html) {
|
|
|
|
translator.translate(html, function (html) {
|
|
|
|
var uploadModal = $(html);
|
|
|
|
var uploadModal = $(html);
|
|
|
|
uploadModal.modal('show');
|
|
|
|
uploadModal.modal('show');
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
uploadModal.find('.upload-btn').on('click', function () {
|
|
|
|
|
|
|
|
var url = uploadModal.find('#uploadFromUrl').val();
|
|
|
|
|
|
|
|
if (!url) {
|
|
|
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
uploadModal.modal('hide');
|
|
|
|
uploadModal.find('.upload-btn').on('click', function () {
|
|
|
|
|
|
|
|
var url = uploadModal.find('#uploadFromUrl').val();
|
|
|
|
|
|
|
|
if (!url) {
|
|
|
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
pictureCropper.handleImageCrop({
|
|
|
|
uploadModal.modal('hide');
|
|
|
|
url: url,
|
|
|
|
|
|
|
|
socketMethod: 'user.uploadCroppedPicture',
|
|
|
|
|
|
|
|
aspectRatio: 1,
|
|
|
|
|
|
|
|
allowSkippingCrop: false,
|
|
|
|
|
|
|
|
paramName: 'uid',
|
|
|
|
|
|
|
|
paramValue: ajaxify.data.theirid,
|
|
|
|
|
|
|
|
}, onUploadComplete);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return false;
|
|
|
|
pictureCropper.handleImageCrop({
|
|
|
|
});
|
|
|
|
url: url,
|
|
|
|
|
|
|
|
socketMethod: 'user.uploadCroppedPicture',
|
|
|
|
|
|
|
|
aspectRatio: 1,
|
|
|
|
|
|
|
|
allowSkippingCrop: false,
|
|
|
|
|
|
|
|
paramName: 'uid',
|
|
|
|
|
|
|
|
paramValue: ajaxify.data.theirid,
|
|
|
|
|
|
|
|
}, onUploadComplete);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return false;
|
|
|
|
});
|
|
|
|
});
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
|
|
|
Peter Jaszkowiak
5 years ago
committed by
GitHub