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

fixed #877

Browse Source
This commit is contained in:
Julian Lam
2014-01-26 16:22:50 -05:00
parent 0869765e2b
commit 0c71707fb5
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1097,7 +1097,7 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
var insertAfter = findInsertionPoint();
parseAndTranslatePosts(data.posts, function(translatedHTML) {
parseAndTranslatePosts(data, function(translatedHTML) {
var translated = $(translatedHTML);
if(!infiniteLoaded) {
@@ -1112,8 +1112,8 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
});
}
function parseAndTranslatePosts(posts, callback) {
var html = templates.prepare(templates['topic'].blocks['posts']).parse({posts: posts});
function parseAndTranslatePosts(data, callback) {
var html = templates.prepare(templates['topic'].blocks['posts']).parse(data);
var regexp = new RegExp("<!--[\\s]*IF @first[\\s]*-->([\\s\\S]*?)<!--[\\s]*ENDIF @first[\\s]*-->", 'g');
html = html.replace(regexp, '');

16
src/socket.io/topics.js
View File

@@ -1,6 +1,9 @@
var topics = require('../topics'),
threadTools = require('../threadTools'),
index = require('./index'),
async = require('async'),
SocketTopics = {};
SocketTopics.post = function(socket, data, callback) {
@@ -236,12 +239,15 @@ SocketTopics.loadMore = function(socket, data, callback) {
var start = data.after,
end = start + postsPerPage - 1;
topics.getTopicPosts(data.tid, start, end, socket.uid, function(err, posts) {
if(err) {
return callback(err);
async.parallel({
posts: function(next) {
topics.getTopicPosts(data.tid, start, end, socket.uid, next);
},
privileges: function(next) {
threadTools.privileges(data.tid, socket.uid, next);
}
callback(err, {posts: posts});
}, function(err, results) {
callback(err, results);
});
};