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

fixed post count in paginator and post bar when infinite loader kicked in

Browse Source
This commit is contained in:
Baris Soner Usakli
2013-12-01 17:42:26 -05:00
parent 66cdb9a067
commit ddb7896df1
2 changed files with 77 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,7 @@
define(function() { define(function() {
var Topic = {}, var Topic = {},
infiniteLoaderActive = false; infiniteLoaderActive = false,
pagination;
function showBottomPostBar() { function showBottomPostBar() {
if($('#post-container .post-row').length > 1) { if($('#post-container .post-row').length > 1) {
@@ -775,9 +775,13 @@ define(function() {
var pagination;
Topic.postCount = templates.get('postcount'); Topic.postCount = templates.get('postcount');
window.onscroll = updateHeader;
window.onload = updateHeader;
};
function updateHeader() { function updateHeader() {
if (pagination == null) { if (pagination == null) {
jQuery('.pagination-block i:first').on('click', function() { jQuery('.pagination-block i:first').on('click', function() {
@@ -794,6 +798,7 @@ define(function() {
var scrollBottom = scrollTop + windowHeight; var scrollBottom = scrollTop + windowHeight;
var progressBar = $('.progress-bar'); var progressBar = $('.progress-bar');
var progressBarContainer = $('.progress-container'); var progressBarContainer = $('.progress-container');
var tid = templates.get('topic_id');
pagination.parentNode.style.display = 'block'; pagination.parentNode.style.display = 'block';
progressBarContainer.css('display', ''); progressBarContainer.css('display', '');
@@ -840,10 +845,6 @@ define(function() {
}, 100); }, 100);
} }
window.onscroll = updateHeader;
window.onload = updateHeader;
};
Topic.scrollToPost = function(pid) { Topic.scrollToPost = function(pid) {
if (!pid) { if (!pid) {
return; return;
@@ -944,8 +945,13 @@ define(function() {
} }
function updatePostCount() { function updatePostCount() {
Topic.postCount = $('#post-container li[data-pid]:not(.deleted)').length; socket.emit('api:topics.postcount', templates.get('topic_id'), function(err, postcount) {
if(!err) {
Topic.postCount = postcount;
$('#topic-post-count').html(Topic.postCount); $('#topic-post-count').html(Topic.postCount);
updateHeader();
}
})
} }
function loadMorePosts(tid, callback) { function loadMorePosts(tid, callback) {

4
src/websockets.js
View File

@@ -403,6 +403,10 @@ module.exports.init = function(io) {
}); });
socket.on('api:topics.postcount', function(tid, callback) {
topics.getTopicField(tid, 'postcount', callback);
});
socket.on('api:topics.markAllRead', function(data, callback) { socket.on('api:topics.markAllRead', function(data, callback) {
topics.markAllRead(uid, function(err, success) { topics.markAllRead(uid, function(err, success) {
if (!err && success) { if (!err && success) {