mirror of
https://github.com/NodeBB/NodeBB.git
synced 2025-11-15 18:26:15 +01:00
closes #4629
This commit is contained in:
@@ -88,7 +88,8 @@ define('forum/unread', ['forum/recent', 'topicSelect', 'forum/infinitescroll', '
|
||||
var cid = params.cid;
|
||||
infinitescroll.loadMore('topics.loadMoreUnreadTopics', {
|
||||
after: $('[component="category"]').attr('data-nextstart'),
|
||||
cid: cid
|
||||
cid: cid,
|
||||
filter: ajaxify.data.selectedFilter.filter
|
||||
}, function(data, done) {
|
||||
if (data.topics && data.topics.length) {
|
||||
recent.onTopicsLoaded('unread', data.topics, true, done);
|
||||
|
||||
@@ -63,15 +63,18 @@ unreadController.get = function(req, res, next) {
|
||||
results.unreadTopics.filters = [{
|
||||
name: '[[unread:all-topics]]',
|
||||
url: 'unread',
|
||||
selected: filter === ''
|
||||
selected: filter === '',
|
||||
filter: ''
|
||||
}, {
|
||||
name: '[[unread:new-topics]]',
|
||||
url: 'unread/new',
|
||||
selected: filter === 'new'
|
||||
selected: filter === 'new',
|
||||
filter: 'new'
|
||||
}, {
|
||||
name: '[[unread:watched-topics]]',
|
||||
url: 'unread/watched',
|
||||
selected: filter === 'watched'
|
||||
selected: filter === 'watched',
|
||||
filter: 'watched'
|
||||
}];
|
||||
|
||||
results.unreadTopics.selectedFilter = results.unreadTopics.filters.filter(function(filter) {
|
||||
|
||||
@@ -96,10 +96,10 @@ module.exports = function(SocketTopics) {
|
||||
return callback(new Error('[[error:invalid-data]]'));
|
||||
}
|
||||
|
||||
var start = parseInt(data.after, 10),
|
||||
stop = start + 9;
|
||||
var start = parseInt(data.after, 10);
|
||||
var stop = start + 9;
|
||||
|
||||
topics.getUnreadTopics(data.cid, socket.uid, start, stop, callback);
|
||||
topics.getUnreadTopics(data.cid, socket.uid, start, stop, data.filter, callback);
|
||||
};
|
||||
|
||||
SocketTopics.loadMoreFromSet = function(socket, data, callback) {
|
||||
|
||||
Reference in New Issue
Block a user