From 92be63ebe6f62c9114b5866e3308f28d9daaab41 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 6 Nov 2015 10:37:42 -0500 Subject: [PATCH] Update user account removeFn As I did not realise both groups and users call the same coverPhoto lib, the removeFn has to be in the user client js, and not in the coverPhoto lib. ... of course, it *could* be in there, but it would be hacky. --- public/src/client/account/header.js | 15 ++++++++++++++- public/src/modules/coverPhoto.js | 16 ++-------------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/public/src/client/account/header.js b/public/src/client/account/header.js index 8a55177d24..bf64c92f9d 100644 --- a/public/src/client/account/header.js +++ b/public/src/client/account/header.js @@ -68,7 +68,8 @@ define('forum/account/header', [ uploader.open(RELATIVE_PATH + '/api/user/' + ajaxify.data.userslug + '/uploadcover', { uid: yourid }, 0, function(imageUrlOnServer) { components.get('account/cover').css('background-image', 'url(' + imageUrlOnServer + ')'); }); - } + }, + removeCover ); } @@ -132,5 +133,17 @@ define('forum/account/header', [ }); } + function removeCover() { + socket.emit('user.removeCover', { + uid: ajaxify.data.uid + }, function(err) { + if (!err) { + ajaxify.refresh(); + } else { + app.alertError(err.message); + } + }); + } + return AccountHeader; }); diff --git a/public/src/modules/coverPhoto.js b/public/src/modules/coverPhoto.js index ef90f26e9a..df9246ab7f 100644 --- a/public/src/modules/coverPhoto.js +++ b/public/src/modules/coverPhoto.js @@ -10,7 +10,7 @@ define('coverPhoto', [ saveFn: null }; - coverPhoto.init = function(coverEl, saveFn, uploadFn) { + coverPhoto.init = function(coverEl, saveFn, uploadFn, removeFn) { coverPhoto.coverEl = coverEl; coverPhoto.saveFn = saveFn; @@ -23,7 +23,7 @@ define('coverPhoto', [ units: 'percent' }); }); - coverEl.find('.remove').on('click', coverPhoto.remove); + coverEl.find('.remove').on('click', removeFn); coverEl .on('dragover', coverPhoto.onDragOver) @@ -80,17 +80,5 @@ define('coverPhoto', [ }); }; - coverPhoto.remove = function() { - socket.emit('user.removeCover', { - uid: ajaxify.data.uid - }, function(err) { - if (!err) { - ajaxify.refresh(); - } else { - app.alertError(err.message); - } - }); - }; - return coverPhoto; }); \ No newline at end of file