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

Merge pull request #4415 from boomzillawtf/master

Browse Source 
Loads posts if appropriate, but doesn't scroll to new post according …
This commit is contained in:
Barış Soner Uşaklı
2016-03-21 10:11:50 +02:00
parent e5188ee05b 3d0012d730
commit 86180e29e6
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,12 +33,10 @@ define('forum/topic/posts', [
ajaxify.data.postcount ++; ajaxify.data.postcount ++;
postTools.updatePostCount(ajaxify.data.postcount); postTools.updatePostCount(ajaxify.data.postcount);
if (ajaxify.data.scrollToMyPost) { if (config.usePagination) {
if (config.usePagination) { onNewPostPagination(data);
onNewPostPagination(data); } else {
} else { onNewPostInfiniteScroll(data);
onNewPostInfiniteScroll(data);
}
} }
}; };
@@ -52,7 +50,9 @@ define('forum/topic/posts', [
function onNewPostPagination(data) { function onNewPostPagination(data) {
function scrollToPost() { function scrollToPost() {
scrollToPostIfSelf(data.posts[0]); if (config.scrollToMyPost) {
scrollToPostIfSelf(data.posts[0]);
}
} }
var posts = data.posts; var posts = data.posts;
@@ -64,7 +64,7 @@ define('forum/topic/posts', [
if (isPostVisible) { if (isPostVisible) {
createNewPosts(data, components.get('post').not('[data-index=0]'), direction, scrollToPost); createNewPosts(data, components.get('post').not('[data-index=0]'), direction, scrollToPost);
} else if (parseInt(posts[0].uid, 10) === parseInt(app.user.uid, 10)) { } else if (config.scrollToMyPost && parseInt(posts[0].uid, 10) === parseInt(app.user.uid, 10)) {
pagination.loadPage(ajaxify.data.pagination.pageCount, scrollToPost); pagination.loadPage(ajaxify.data.pagination.pageCount, scrollToPost);
} }
} }
@@ -81,6 +81,9 @@ define('forum/topic/posts', [
} }
function scrollToPostIfSelf(post) { function scrollToPostIfSelf(post) {
if (!config.scrollToMyPost) {
return;
}
var isSelfPost = parseInt(post.uid, 10) === parseInt(app.user.uid, 10); var isSelfPost = parseInt(post.uid, 10) === parseInt(app.user.uid, 10);
if (isSelfPost) { if (isSelfPost) {
navigator.scrollBottom(post.index); navigator.scrollBottom(post.index);