Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-16 10:46:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

closes #4975

Browse Source
This commit is contained in:
barisusakli
2016-08-25 10:30:46 +03:00
parent 6516b70f9a
commit 9eb64aa3fa
2 changed files with 19 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
public/src/ajaxify.js
View File

@@ -216,11 +216,7 @@ $(document).ready(function() {
return url; return url;
}; };
ajaxify.refresh = function(e, callback) { ajaxify.refresh = function(callback) {
if (e && e instanceof jQuery.Event) {
e.preventDefault();
}
ajaxify.go(ajaxify.currentPage + window.location.search + window.location.hash, callback, true); ajaxify.go(ajaxify.currentPage + window.location.search + window.location.hash, callback, true);
}; };

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

@@ -2,12 +2,10 @@
/* globals define, ajaxify, socket, app, config, templates, bootbox */ /* globals define, ajaxify, socket, app, config, templates, bootbox */
define('forum/account/edit', ['forum/account/header', 'uploader', 'translator'], function(header, uploader, translator) { define('forum/account/edit', ['forum/account/header', 'uploader', 'translator', 'components'], function(header, uploader, translator, components) {
var AccountEdit = {}, var AccountEdit = {};
uploadedPicture = '';
AccountEdit.init = function() { AccountEdit.init = function() {
uploadedPicture = ajaxify.data.uploadedpicture;
header.init(); header.init();
@@ -59,17 +57,15 @@ define('forum/account/edit', ['forum/account/header', 'uploader', 'translator'],
} }
function updateHeader(picture) { function updateHeader(picture) {
require(['components'], function(components) { if (parseInt(ajaxify.data.theirid, 10) !== parseInt(ajaxify.data.yourid, 10)) {
if (parseInt(ajaxify.data.theirid, 10) !== parseInt(ajaxify.data.yourid, 10)) { return;
return; }
}
components.get('header/userpicture')[picture ? 'show' : 'hide'](); components.get('header/userpicture')[picture ? 'show' : 'hide']();
components.get('header/usericon')[!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);
} }
});
} }
function handleImageChange() { function handleImageChange() {
@@ -137,8 +133,8 @@ define('forum/account/edit', ['forum/account/header', 'uploader', 'translator'],
} }
function saveSelection() { function saveSelection() {
var type = modal.find('.list-group-item.active').attr('data-type'), var type = modal.find('.list-group-item.active').attr('data-type');
src = modal.find('.list-group-item.active img').attr('src');
changeUserPicture(type, function(err) { changeUserPicture(type, function(err) {
if (err) { if (err) {
return app.alertError(err.message); return app.alertError(err.message);
@@ -192,15 +188,17 @@ define('forum/account/edit', ['forum/account/header', 'uploader', 'translator'],
function handleImageUpload(modal) { function handleImageUpload(modal) {
function onUploadComplete(urlOnServer) { function onUploadComplete(urlOnServer) {
urlOnServer = urlOnServer + '?' + new Date().getTime(); urlOnServer = urlOnServer + '?' + Date.now();
updateHeader(urlOnServer); updateHeader(urlOnServer);
if (ajaxify.data.picture.length) { if (ajaxify.data.picture.length) {
$('#user-current-picture, img.avatar').attr('src', urlOnServer); $('#user-current-picture, img.avatar').attr('src', urlOnServer);
uploadedPicture = urlOnServer; ajaxify.data.uploadedpicture = urlOnServer;
} else { } else {
ajaxify.refresh(); ajaxify.refresh(function() {
$('#user-current-picture, img.avatar').attr('src', urlOnServer);
});
} }
} }