From 2507d6c853d1d95ffd8add222bcb5c94f2f59c72 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Tue, 25 Mar 2014 13:52:25 -0400 Subject: [PATCH] display_moderator_tools is already returned when new posts were loaded, we were making a socket call for each post to check if the post is editable, but this data is already returned in display_moderator_tools when posts are loaded. --- public/src/forum/topic.js | 11 +---------- src/socket.io/posts.js | 10 ---------- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/public/src/forum/topic.js b/public/src/forum/topic.js index f89e4af806..7149ef98b7 100644 --- a/public/src/forum/topic.js +++ b/public/src/forum/topic.js @@ -775,17 +775,8 @@ define(['forum/pagination', 'forum/topic/threadTools', 'forum/topic/postTools'], function onNewPostsLoaded(html, posts) { - function getPostPrivileges(pid) { - socket.emit('posts.getPrivileges', pid, function(err, privileges) { - if(err) { - return app.alertError(err.message); - } - toggle_mod_tools(privileges.pid, privileges.editable); - }); - } - for (var x = 0, numPosts = posts.length; x < numPosts; x++) { - getPostPrivileges(posts[x].pid); + toggle_mod_tools(posts[x].pid, posts[x].display_moderator_tools); } infiniteLoaderActive = false; diff --git a/src/socket.io/posts.js b/src/socket.io/posts.js index 63f97a5bce..9d4a4871d8 100644 --- a/src/socket.io/posts.js +++ b/src/socket.io/posts.js @@ -219,16 +219,6 @@ function deleteOrRestore(command, socket, data, callback) { }); } -SocketPosts.getPrivileges = function(socket, pid, callback) { - postTools.privileges(pid, socket.uid, function(err, privileges) { - if(err) { - return callback(err); - } - privileges.pid = parseInt(pid, 10); - callback(null, privileges); - }); -}; - SocketPosts.getFavouritedUsers = function(socket, pid, callback) { favourites.getFavouritedUidsByPids([pid], function(err, data) {