diff --git a/public/src/client/unread.js b/public/src/client/unread.js index 47b96e54ad..9300377ce3 100644 --- a/public/src/client/unread.js +++ b/public/src/client/unread.js @@ -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); diff --git a/src/controllers/unread.js b/src/controllers/unread.js index f0b7471b63..d72099e7c5 100644 --- a/src/controllers/unread.js +++ b/src/controllers/unread.js @@ -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) { diff --git a/src/socket.io/topics/infinitescroll.js b/src/socket.io/topics/infinitescroll.js index 5c45c6e4fb..5f089bd52e 100644 --- a/src/socket.io/topics/infinitescroll.js +++ b/src/socket.io/topics/infinitescroll.js @@ -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) {