Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-29 01:56:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

lots of pagination work, query params, ajaxify to pids

Browse Source
This commit is contained in:
Baris Soner Usakli
2014-01-25 19:19:25 -05:00
parent 8744013013
commit 1084523c92
13 changed files with 144 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,24 +52,10 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
}
});
} else {
pagination.init(templates.get('currentPage'), templates.get('pageCount'), loadPage);
pagination.init(templates.get('currentPage'), templates.get('pageCount'));
}
}
function loadPage(page, callback) {
socket.emit('categories.loadPage', {cid: templates.get('category_id'), page: page}, function(err, data) {
if(err) {
return callback(err);
}
if (data && data.topics && data.topics.length) {
Category.onTopicsLoaded(data.topics);
}
callback(null);
});
}
Category.onNewTopic = function(data) {
var html = templates.prepare(templates['category'].blocks['topics']).parse({
topics: [data]

19
public/src/forum/pagination.js
View File

@@ -5,12 +5,10 @@ define(function() {
pagination.currentPage = 0;
pagination.pageCount = 0;
pagination.loadFunction = null;
pagination.init = function(currentPage, pageCount, loadFunction) {
pagination.init = function(currentPage, pageCount) {
pagination.currentPage = parseInt(currentPage, 10);
pagination.pageCount = parseInt(pageCount, 10);
pagination.loadFunction = loadFunction;
updatePageLinks();
@@ -48,17 +46,9 @@ define(function() {
return;
}
pagination.loadFunction(page, function(err) {
if(err) {
return app.alertError(err.message);
ajaxify.go(window.location.pathname.slice(1) + '?page=' + page);
}
pagination.currentPage = parseInt(page, 10);
updatePageLinks();
});
}
function updatePageLinks() {
if(pagination.pageCount === 0) {
$('.pagination').addClass('hide');
@@ -79,6 +69,11 @@ define(function() {
$('.pagination .page').removeClass('active');
$('.pagination .page[data-page="' + pagination.currentPage + '"]').addClass('active');
$('.pagination .page').each(function(index, element) {
var li = $(this);
var page = li.attr('data-page');
li.find('a').attr('href', window.location.pathname + '?page=' + page);
});
}
return pagination;

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

@@ -4,8 +4,8 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
pagination;
function showBottomPostBar() {
if($('#post-container .post-row').length > 1) {
$('.topic-main-buttons').removeClass('hide').parent().removeClass('hide');
if($('#post-container .post-row').length > 1 || !$('#post-container li[data-index="0"]').length) {
$('.bottom-post-bar').removeClass('hide');
}
}
@@ -328,7 +328,7 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
var bookmark = localStorage.getItem('topic:' + tid + ':bookmark');
if(bookmark && !config.usePagination) {
if(bookmark) {
Topic.scrollToPost(parseInt(bookmark, 10));
}
@@ -358,65 +358,10 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
} else {
$('.pagination-block').addClass('hide');
pagination.init(currentPage, pageCount, loadPage);
pagination.init(currentPage, pageCount);
}
}
function loadPage(page, callback) {
if(page === 1) {
ajaxify.go('topic/' + tid );
return;
}
socket.emit('topics.loadPage', {tid: tid, page: page}, function(err, data) {
if(err) {
return callback(err);
}
if (data && data.posts && data.posts.length) {
createPagePosts(data, function() {
fixDeleteStateForPosts();
});
}
callback(null);
});
}
function onNewPostPagination(data) {
var posts = data.posts;
socket.emit('topics.getPageCount', tid, function(err, newPageCount) {
pagination.recreatePaginationLinks('topic', newPageCount);
if(pagination.currentPage === pagination.newPageCount) {
createNewPosts(data);
} else if(data.posts && data.posts.length && parseInt(data.posts[0].uid, 10) === parseInt(app.uid, 10)) {
pagination.loadPage(pagination.pageCount);
}
});
}
function createPagePosts(data, callback) {
if(!data || (data.posts && !data.posts.length)) {
return;
}
parseAndTranslatePosts(data.posts, function(translatedHTML) {
var translated = $(translatedHTML);
$('#post-container').fadeOut(200, function() {
$('#post-container').empty().append(translated).fadeIn('slow');
onNewPostsLoaded(data.posts);
callback();
});
});
}
$('.topic').on('click', '.post_reply', function() {
var selectionText = '',
selection = window.getSelection() || document.getSelection();
@@ -1071,6 +1016,19 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
return;
}
if(config.usePagination) {
socket.emit('posts.getPidPage', pid, function(err, page) {
if(parseInt(page, 10) !== pagination.currentPage) {
pagination.loadPage(page);
} else {
scrollToPid(pid);
}
});
} else {
scrollToPid(pid);
}
function scrollToPid(pid) {
var container = $(window),
scrollTo = $('#post_anchor_' + pid),
tid = $('#post-container').attr('data-tid');
@@ -1100,6 +1058,21 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
animateScroll();
}
}
}
function onNewPostPagination(data) {
var posts = data.posts;
socket.emit('topics.getPageCount', tid, function(err, newPageCount) {
pagination.recreatePaginationLinks('topic', newPageCount);
if(pagination.currentPage === pagination.pageCount) {
createNewPosts(data);
} else if(data.posts && data.posts.length && parseInt(data.posts[0].uid, 10) === parseInt(app.uid, 10)) {
pagination.loadPage(pagination.pageCount);
}
});
}
function createNewPosts(data, infiniteLoaded) {
if(!data || (data.posts && !data.posts.length)) {

6
public/templates/topic.tpl
View File

@@ -143,7 +143,7 @@
</li>
<!-- IF @first -->
<li class="well post-bar">
<li class="well post-bar" data-index="{posts.index}">
<div class="inline-block">
<small class="topic-stats">
<span>[[category:posts]]</span>
@@ -178,8 +178,8 @@
<!-- END posts -->
</ul>
<div class="well col-md-11 col-xs-12 pull-right hide">
<div class="topic-main-buttons pull-right inline-block hide">
<div class="well col-md-11 col-xs-12 pull-right post-bar bottom-post-bar hide">
<div class="topic-main-buttons pull-right inline-block">
<div class="loading-indicator" done="0" style="display:none;">
<span class="hidden-xs-inline">[[topic:loading_more_posts]]</span> <i class="fa fa-refresh fa-spin"></i>
</div>

5
src/categories.js
View File

@@ -46,15 +46,14 @@ var db = require('./database.js'),
});
};
Categories.getCategoryById = function(category_id, current_user, callback) {
Categories.getCategoryById = function(category_id, start, end, current_user, callback) {
Categories.getCategoryData(category_id, function(err, categoryData) {
if (err) {
return callback(err);
}
function getTopicIds(next) {
var topicsPerPage = meta.config.topicsPerPage || 20;
Categories.getTopicIds(category_id, 0, topicsPerPage - 1, next);
Categories.getTopicIds(category_id, start, end, next);
}
function getActiveUsers(next) {

2
src/feed.js
View File

@@ -84,7 +84,7 @@
};
Feed.updateCategory = function (cid, callback) {
categories.getCategoryById(cid, 0, function (err, categoryData) {
categories.getCategoryById(cid, 0, -1, 0, function (err, categoryData) {
if (err) return callback(new Error('category-invalid'));
var feed = new rss({

24
src/posts.js
View File

@@ -468,4 +468,28 @@ var db = require('./database'),
});
}
Posts.getPidPage = function(pid, callback) {
Posts.getPostField(pid, 'tid', function(err, tid) {
if(err) {
return callback(err);
}
topics.getPids(tid, function(err, pids) {
if(err) {
return callback(err);
}
var index = pids.indexOf(pid);
if(index === -1) {
return callback(new Error('pid not found'));
}
var postsPerPage = parseInt(meta.config.postsPerPage, 10);
postsPerPage = postsPerPage ? postsPerPage : 20;
var page = Math.ceil((index + 1) / postsPerPage);
callback(null, page);
});
});
}
}(exports));

44
src/routes/api.js
View File

@@ -164,17 +164,33 @@ var path = require('path'),
});
app.get('/topic/:id/:slug?', function (req, res, next) {
console.log(req.query);
var uid = (req.user) ? req.user.uid : 0;
var page = 1;
if(req.query && req.query.page) {
page = req.query.page;
}
if(parseInt(page, 10) < 1) {
return res.send(404);
}
var postsPerPage = parseInt(meta.config.postsPerPage ? meta.config.postsPerPage : 20, 10);
var start = (page - 1) * postsPerPage;
var end = start + postsPerPage - 1;
ThreadTools.privileges(req.params.id, uid, function(err, privileges) {
if (privileges.read) {
var postsPerPage = parseInt(meta.config.postsPerPage ? meta.config.postsPerPage : 20, 10);
topics.getTopicWithPosts(req.params.id, uid, 0, postsPerPage - 1, false, function (err, data) {
topics.getTopicWithPosts(req.params.id, uid, start, end, false, function (err, data) {
if(err) {
return next(err);
}
data.currentPage = 1;
if(page > data.pageCount) {
return res.send(404);
}
data.currentPage = page;
data.privileges = privileges;
if (parseInt(data.deleted, 10) === 1 && parseInt(data.expose_tools, 10) === 0) {
@@ -191,16 +207,32 @@ var path = require('path'),
app.get('/category/:id/:slug?', function (req, res, next) {
var uid = (req.user) ? req.user.uid : 0;
var page = 1;
if(req.query && req.query.page) {
page = req.query.page;
}
if(parseInt(page, 10) < 1) {
return res.send(404);
}
var topicsPerPage = parseInt(meta.config.topicsPerPage ? meta.config.topicsPerPage : 20, 10);
var start = (page - 1) * topicsPerPage;
var end = start + topicsPerPage - 1;
// Category Whitelisting
categoryTools.privileges(req.params.id, uid, function(err, privileges) {
if (!err && privileges.read) {
categories.getCategoryById(req.params.id, uid, function (err, data) {
categories.getCategoryById(req.params.id, start, end, uid, function (err, data) {
if(err) {
return next(err);
}
data.currentPage = 1;
if(page > data.pageCount) {
return res.send(404);
}
data.currentPage = page;
data.privileges = privileges;
if (data && parseInt(data.disabled, 10) === 0) {

17
src/socket.io/categories.js
View File

@@ -28,23 +28,6 @@ SocketCategories.loadMore = function(socket, data, callback) {
});
};
SocketCategories.loadPage = function(socket, data, callback) {
if(!data) {
return callback(new Error('invalid data'));
}
var topicsPerPage = parseInt(meta.config.topicsPerPage, 10) || 20;
var start = (data.page - 1) * topicsPerPage,
end = start + topicsPerPage - 1;
categories.getCategoryTopics(data.cid, start, end, socket.uid, function(err, topics) {
callback(err, {
topics: topics
});
});
}
SocketCategories.getPageCount = function(socket, cid, callback) {
categories.getPageCount(cid, callback);
}

4
src/socket.io/posts.js
View File

@@ -194,4 +194,8 @@ SocketPosts.getFavouritedUsers = function(socket, pid, callback) {
});
};
SocketPosts.getPidPage = function(socket, pid, callback) {
posts.getPidPage(pid, callback);
}
module.exports = SocketPosts;

25
src/socket.io/topics.js
View File

@@ -245,31 +245,6 @@ SocketTopics.loadMore = function(socket, data, callback) {
});
};
SocketTopics.loadPage = function(socket, data, callback) {
if(!data || !data.tid || !data.page || parseInt(data.page < 0)) {
return callback(new Error('invalid data'));
}
var postsPerPage = parseInt((meta.config.postsPerPage ? meta.config.postsPerPage : 20), 10);
topics.getPageCount(data.tid, function(err, pageCount) {
if(err) {
return callback(err);
}
if(data.page > pageCount) {
return callback(new Error('page doesn\'t exist'));
}
var start = (data.page-1) * postsPerPage,
end = start + postsPerPage - 1;
topics.getTopicPosts(data.tid, start, end, socket.uid, function(err, posts) {
callback(err, {posts: posts});
});
});
}
SocketTopics.loadMoreRecentTopics = function(socket, data, callback) {
if(!data || !data.term) {
return callback(new Error('invalid data'));

11
src/webserver.js
View File

@@ -9,6 +9,7 @@ var path = require('path'),
validator = require('validator'),
async = require('async'),
S = require('string'),
qs = require('querystring'),
pkg = require('../package.json'),
@@ -644,6 +645,10 @@ module.exports.server = server;
}
var topic_url = tid + (req.params.slug ? '/' + req.params.slug : '');
var queryString = qs.stringify(req.query);
if(queryString.length) {
topic_url += '?' + queryString;
}
res.send(
data.header +
@@ -701,7 +706,7 @@ module.exports.server = server;
});
},
function (next) {
categories.getCategoryById(cid, 0, function (err, categoryData) {
categories.getCategoryById(cid, 0, -1, 0, function (err, categoryData) {
if (categoryData) {
if (parseInt(categoryData.disabled, 10) === 1) {
@@ -758,6 +763,10 @@ module.exports.server = server;
}
var category_url = cid + (req.params.slug ? '/' + req.params.slug : '');
var queryString = qs.stringify(req.query);
if(queryString.length) {
category_url += '?' + queryString;
}
res.send(
data.header +

2
tests/categories.js
View File

@@ -31,7 +31,7 @@ describe('Categories', function() {
describe('.getCategoryById', function() {
it('should retrieve a newly created category by its ID', function(done) {
Categories.getCategoryById(categoryObj.cid, 0, function(err, categoryData) {
Categories.getCategoryById(categoryObj.cid, 0, -1, 0, function(err, categoryData) {
assert(categoryData);
assert.equal(categoryObj.name, categoryData.category_name);
assert.equal(categoryObj.description, categoryData.category_description);