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

#5667

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2017-05-12 14:58:40 -04:00
parent 4c00a5ece6
commit 70adcd64bc
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/src/client/category.js
View File

@@ -345,7 +345,7 @@ define('forum/category', [
} }
if (!topicSelect.getSelectedTids().length) { if (!topicSelect.getSelectedTids().length) {
infinitescroll.removeExtra($('[component="category/topic"]'), direction, 60); infinitescroll.removeExtra($('[component="category/topic"]'), direction, config.topicsPerPage * 3);
} }
html.find('.timeago').timeago(); html.find('.timeago').timeago();

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

@@ -192,7 +192,7 @@ define('forum/topic/posts', [
components.get('topic').append(html); components.get('topic').append(html);
} }
infinitescroll.removeExtra($('[component="post"]'), direction, 40); infinitescroll.removeExtra($('[component="post"]'), direction, config.postsPerPage * 2);
$(window).trigger('action:posts.loaded', { posts: data.posts }); $(window).trigger('action:posts.loaded', { posts: data.posts });

8
src/socket.io/topics/infinitescroll.js
View File

@@ -40,7 +40,7 @@ module.exports = function (SocketTopics) {
var reverse = data.topicPostSort === 'newest_to_oldest' || data.topicPostSort === 'most_votes'; var reverse = data.topicPostSort === 'newest_to_oldest' || data.topicPostSort === 'most_votes';
var start = Math.max(0, parseInt(data.after, 10)); var start = Math.max(0, parseInt(data.after, 10));
var infScrollPostsPerPage = Math.max(0, Math.min(meta.config.postsPerPage || 20, parseInt(data.postsPerPage, 10) || meta.config.postsPerPage || 20) - 1); var infScrollPostsPerPage = Math.max(0, Math.min(meta.config.postsPerPage || 20, parseInt(data.count, 10) || meta.config.postsPerPage || 20) - 1);
if (data.direction > 0) { if (data.direction > 0) {
if (reverse) { if (reverse) {
@@ -93,7 +93,7 @@ module.exports = function (SocketTopics) {
} }
var start = parseInt(data.after, 10); var start = parseInt(data.after, 10);
var stop = start + Math.max(0, Math.min(meta.config.topicsPerPage || 20, parseInt(data.topicsPerPage, 10) || meta.config.topicsPerPage || 20) - 1); var stop = start + Math.max(0, Math.min(meta.config.topicsPerPage || 20, parseInt(data.count, 10) || meta.config.topicsPerPage || 20) - 1);
topics.getUnreadTopics({ cid: data.cid, uid: socket.uid, start: start, stop: stop, filter: data.filter }, callback); topics.getUnreadTopics({ cid: data.cid, uid: socket.uid, start: start, stop: stop, filter: data.filter }, callback);
}; };
@@ -104,7 +104,7 @@ module.exports = function (SocketTopics) {
} }
var start = parseInt(data.after, 10); var start = parseInt(data.after, 10);
var stop = start + Math.max(0, Math.min(meta.config.topicsPerPage || 20, parseInt(data.topicsPerPage, 10) || meta.config.topicsPerPage || 20) - 1); var stop = start + Math.max(0, Math.min(meta.config.topicsPerPage || 20, parseInt(data.count, 10) || meta.config.topicsPerPage || 20) - 1);
topics.getRecentTopics(data.cid, socket.uid, start, stop, data.filter, callback); topics.getRecentTopics(data.cid, socket.uid, start, stop, data.filter, callback);
}; };
@@ -115,7 +115,7 @@ module.exports = function (SocketTopics) {
} }
var start = parseInt(data.after, 10); var start = parseInt(data.after, 10);
var stop = start + Math.max(0, Math.min(meta.config.topicsPerPage || 20, parseInt(data.topicsPerPage, 10) || meta.config.topicsPerPage || 20) - 1); var stop = start + Math.max(0, Math.min(meta.config.topicsPerPage || 20, parseInt(data.count, 10) || meta.config.topicsPerPage || 20) - 1);
topics.getTopicsFromSet(data.set, socket.uid, start, stop, callback); topics.getTopicsFromSet(data.set, socket.uid, start, stop, callback);
}; };