From 2f955c3af4ffb3a4593e82c1343c4c17b864d5d4 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Mon, 19 Jan 2015 17:06:43 -0500 Subject: [PATCH] getUpvoters works with array --- public/src/client/topic/postTools.js | 10 +++++----- src/socket.io/posts.js | 7 +++++-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/public/src/client/topic/postTools.js b/public/src/client/topic/postTools.js index 2f5a61757296..5e6df47e8be2 100644 --- a/public/src/client/topic/postTools.js +++ b/public/src/client/topic/postTools.js @@ -39,15 +39,15 @@ define('forum/topic/postTools', ['composer', 'share', 'navigator'], function(com function addVoteHandler() { $('#post-container').on('mouseenter', '.post-row .votes', function() { - loadDataAndCreateTooltip($(this), 'posts.getUpvoters'); + loadDataAndCreateTooltip($(this)); }); } - function loadDataAndCreateTooltip(el, method) { + function loadDataAndCreateTooltip(el) { var pid = el.parents('.post-row').attr('data-pid'); - socket.emit(method, pid, function(err, data) { - if (!err) { - createTooltip(el, data); + socket.emit('posts.getUpvoters', [pid], function(err, data) { + if (!err && data.length) { + createTooltip(el, data[0]); } }); } diff --git a/src/socket.io/posts.js b/src/socket.io/posts.js index 97b8e7ea7430..4a8e5f19bd53 100644 --- a/src/socket.io/posts.js +++ b/src/socket.io/posts.js @@ -339,8 +339,11 @@ SocketPosts.getPrivileges = function(socket, pids, callback) { }); }; -SocketPosts.getUpvoters = function(socket, pid, callback) { - favourites.getUpvotedUidsByPids([pid], function(err, data) { +SocketPosts.getUpvoters = function(socket, pids, callback) { + if (!Array.isArray(pids)) { + return callback(new Error('[[error:invalid-data]]')); + } + favourites.getUpvotedUidsByPids(pids, function(err, data) { if (err || !Array.isArray(data) || !data.length) { return callback(err, []); }