From ce4df8f22b979706bc27c4bfdf0f5fd863fcaecc Mon Sep 17 00:00:00 2001 From: psychobunny Date: Thu, 29 Oct 2015 17:31:30 -0400 Subject: [PATCH] fixed cover image editing on all profile pages --- public/src/client/account/header.js | 36 +++++++++++++++++++++++++--- public/src/client/account/profile.js | 27 ++------------------- 2 files changed, 35 insertions(+), 28 deletions(-) diff --git a/public/src/client/account/header.js b/public/src/client/account/header.js index 226f6ac3de..a0f3dfd2a2 100644 --- a/public/src/client/account/header.js +++ b/public/src/client/account/header.js @@ -1,12 +1,25 @@ 'use strict'; -/* globals define, app, ajaxify */ +/* globals define, app, ajaxify, socket, RELATIVE_PATH */ -define('forum/account/header', function() { - var AccountHeader = {}; +define('forum/account/header', [ + 'coverPhoto', + 'uploader', + 'components' +], function(coverPhoto, uploader, components) { + var AccountHeader = {}, + yourid, + theirid; AccountHeader.init = function() { + yourid = ajaxify.data.yourid; + theirid = ajaxify.data.theirid; + hidePrivateLinks(); selectActivePill(); + + if (parseInt(yourid, 10) === parseInt(theirid, 10)) { + setupCoverPhoto(); + } }; function hidePrivateLinks() { @@ -26,5 +39,22 @@ define('forum/account/header', function() { }); } + function setupCoverPhoto() { + coverPhoto.init(components.get('account/cover'), + function(imageData, position, callback) { + socket.emit('user.updateCover', { + uid: yourid, + imageData: imageData, + position: position + }, callback); + }, + function() { + uploader.open(RELATIVE_PATH + '/api/user/uploadcover', { uid: yourid }, 0, function(imageUrlOnServer) { + components.get('account/cover').css('background-image', 'url(' + imageUrlOnServer + ')'); + }); + } + ); + } + return AccountHeader; }); diff --git a/public/src/client/account/profile.js b/public/src/client/account/profile.js index deffc3ab9a..f0707cedb3 100644 --- a/public/src/client/account/profile.js +++ b/public/src/client/account/profile.js @@ -1,15 +1,13 @@ 'use strict'; -/* globals define, ajaxify, app, utils, socket, bootbox */ +/* globals define, ajaxify, app, socket, bootbox */ define('forum/account/profile', [ 'forum/account/header', 'forum/infinitescroll', 'translator', - 'coverPhoto', - 'uploader', 'components' -], function(header, infinitescroll, translator, coverPhoto, uploader, components) { +], function(header, infinitescroll, translator) { var Account = {}, yourid, theirid, @@ -48,10 +46,6 @@ define('forum/account/profile', [ socket.on('event:user_status_change', onUserStatusChange); infinitescroll.init(loadMorePosts); - - if (parseInt(yourid, 10) === parseInt(theirid, 10)) { - setupCoverPhoto(); - } }; function processPage() { @@ -172,22 +166,5 @@ define('forum/account/profile', [ }); } - function setupCoverPhoto() { - coverPhoto.init(components.get('account/cover'), - function(imageData, position, callback) { - socket.emit('user.updateCover', { - uid: yourid, - imageData: imageData, - position: position - }, callback); - }, - function() { - uploader.open(RELATIVE_PATH + '/api/user/uploadcover', { uid: yourid }, 0, function(imageUrlOnServer) { - components.get('account/cover').css('background-image', 'url(' + imageUrlOnServer + ')'); - }); - } - ); - } - return Account; });