Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-12-16 21:40:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into require.js

Browse Source
This commit is contained in:
psychobunny
2014-05-29 17:25:16 -04:00
parent 281aa0049c 5ae29ef33a
commit f98a52013a
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
public/src/forum/topic.js
View File

@@ -376,7 +376,8 @@ define('forum/topic', ['forum/pagination', 'forum/infinitescroll', 'forum/topic/
}
function loadPostsAfter(after, callback) {
if (!utils.isNumber(after) || (after === 0 && $('#post-container li.post-row[data-index="0"]').length)) {
var tid = ajaxify.variables.get('topic_id');
if (!utils.isNumber(tid) || !utils.isNumber(after) || (after === 0 && $('#post-container li.post-row[data-index="0"]').length)) {
return;
}
@@ -386,7 +387,7 @@ define('forum/topic', ['forum/pagination', 'forum/infinitescroll', 'forum/topic/
}
infinitescroll.loadMore('topics.loadMore', {
tid: ajaxify.variables.get('topic_id'),
tid: tid,
after: after
}, function (data) {