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

Merge remote-tracking branch 'upstream/master'

Browse Source 
Conflicts:
	public/src/client/topic/posts.js
This commit is contained in:
boomzillawtf
2016-03-23 21:41:31 -04:00
parent 6aa0f8eb8a f55b26282a
commit d4464f6ab1
54 changed files with 344 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
public/src/client/topic/posts.js
View File

@@ -26,7 +26,7 @@ define('forum/topic/posts', [
post.selfPost = !!app.user.uid && parseInt(post.uid, 10) === parseInt(app.user.uid, 10);
post.display_moderator_tools = post.selfPost || ajaxify.data.privileges.isAdminOrMod;
post.display_move_tools = ajaxify.data.privileges.isAdminOrMod;
post.display_post_menu = post.selfPost || ajaxify.data.privileges.isAdminOrMod;
post.display_post_menu = ajaxify.data.privileges.isAdminOrMod || post.selfPost || ((app.user.uid || ajaxify.data.postSharing.length) && !post.deleted);
});
updatePostCounts(data.posts);
@@ -50,9 +50,7 @@ define('forum/topic/posts', [
function onNewPostPagination(data) {
function scrollToPost() {
if (ajaxify.data.scrollToMyPost) {
scrollToPostIfSelf(data.posts[0]);
}
scrollToPostIfSelf(data.posts[0]);
}
var posts = data.posts;