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

fix, dont display duped topics on category view

Browse Source
This commit is contained in:
barisusakli
2014-08-29 18:18:31 -04:00
parent 6ac8d9d349
commit 6b286a8f07
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
public/src/forum/category.js
View File

@@ -54,7 +54,7 @@ define('forum/category', ['composer', 'forum/pagination', 'forum/infinitescroll'
function handleIgnoreWatch(cid) {
$('.watch, .ignore').on('click', function() {
$this = $(this);
var $this = $(this);
var command = $this.hasClass('watch') ? 'watch' : 'ignore';
socket.emit('categories.' + command, cid, function(err) {
@@ -65,7 +65,7 @@ define('forum/category', ['composer', 'forum/pagination', 'forum/infinitescroll'
$('.watch').toggleClass('hidden', command === 'watch');
$('.ignore').toggleClass('hidden', command === 'ignore');
});
})
});
}
Category.toTop = function() {
@@ -80,7 +80,7 @@ define('forum/category', ['composer', 'forum/pagination', 'forum/infinitescroll'
Category.navigatorCallback = function(element, elementCount) {
return parseInt(element.attr('data-index'), 10) + 1;
}
};
$(window).on('action:popstate', function(ev, data) {
if(data.url.indexOf('category/') === 0) {
@@ -238,10 +238,8 @@ define('forum/category', ['composer', 'forum/pagination', 'forum/infinitescroll'
return;
}
var topics = data.topics;
function removeAlreadyAddedTopics() {
topics = topics.filter(function(topic) {
function removeAlreadyAddedTopics(topics) {
return topics.filter(function(topic) {
return $('#topics-container li[data-tid="' + topic.tid +'"]').length === 0;
});
}
@@ -255,7 +253,7 @@ define('forum/category', ['composer', 'forum/pagination', 'forum/infinitescroll'
}
var last = $('#topics-container .category-item[data-tid]').last();
var lastIndex = last.attr('data-index');
var firstIndex = topics[topics.length - 1].index;
var firstIndex = data.topics[data.topics.length - 1].index;
if (firstIndex > lastIndex) {
after = last;
} else {
@@ -263,8 +261,8 @@ define('forum/category', ['composer', 'forum/pagination', 'forum/infinitescroll'
}
}
removeAlreadyAddedTopics();
if(!topics.length) {
data.topics = removeAlreadyAddedTopics(data.topics);
if(!data.topics.length) {
return;
}