Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-07-06 05:50:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

closes #4643

Browse Source
This commit is contained in:
barisusakli
2016-05-14 19:39:20 +03:00
parent b2552cb5e0
commit 825ecce0df
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
public/src/client/recent.js
View File

@@ -1,6 +1,6 @@
'use strict';
/* globals define, app, socket, utils */
/* globals define, app, socket, utils, ajaxify, config */
define('forum/recent', ['forum/infinitescroll', 'components'], function(infinitescroll, components) {
var Recent = {};
@@ -55,11 +55,15 @@ define('forum/recent', ['forum/infinitescroll', 'components'], function(infinite
Recent.updateAlertText();
}
if (parseInt(data.topic.mainPid, 10) === parseInt(data.posts[0].pid, 10)) {
var post = data.posts[0];
if (!post || !post.topic) {
return;
}
if (parseInt(post.topic.mainPid, 10) === parseInt(post.pid, 10)) {
return;
}
if (ajaxify.data.selectedCategory && parseInt(ajaxify.data.selectedCategory.cid, 10) !== parseInt(data.topic.cid, 10)) {
if (ajaxify.data.selectedCategory && parseInt(ajaxify.data.selectedCategory.cid, 10) !== parseInt(post.topic.cid, 10)) {
return;
}
@@ -68,7 +72,7 @@ define('forum/recent', ['forum/infinitescroll', 'components'], function(infinite
}
if (ajaxify.data.selectedFilter && ajaxify.data.selectedFilter.url === 'unread/watched') {
socket.emit('topics.isFollowed', data.topic.tid, function(err, isFollowed) {
socket.emit('topics.isFollowed', post.tid, function(err, isFollowed) {
if (err) {
app.alertError(err.message);
}

2
src/socket.io/topics/unread.js
View File

@@ -46,7 +46,7 @@ module.exports = function(SocketTopics) {
};
SocketTopics.markCategoryTopicsRead = function(socket, cid, callback) {
topics.getUnreadTids(cid, socket.uid, function(err, tids) {
topics.getUnreadTids(cid, socket.uid, '', function(err, tids) {
if (err) {
return callback(err);
}

2
src/topics/create.js
View File

@@ -274,7 +274,7 @@ module.exports = function(Topics) {
posts.getUserInfoForPosts([postData.uid], uid, next);
},
topicInfo: function(next) {
Topics.getTopicFields(tid, ['tid', 'title', 'slug', 'cid', 'postcount'], next);
Topics.getTopicFields(tid, ['tid', 'title', 'slug', 'cid', 'postcount', 'mainPid'], next);
},
parents: function(next) {
Topics.addParentPosts([postData], next);