fixing background visibility and states
This commit is contained in:
@@ -23,7 +23,8 @@ export default (router, tpl) => {
|
||||
url: contextUrl,
|
||||
user: query.user,
|
||||
tag: query.tag,
|
||||
mime: query.mime
|
||||
mime: query.mime,
|
||||
fav: query.fav === 'true'
|
||||
});
|
||||
|
||||
if (!data.success) {
|
||||
@@ -38,10 +39,8 @@ export default (router, tpl) => {
|
||||
if (req.session) {
|
||||
data.session = { ...req.session };
|
||||
// data.user comes from f0cklib (uploader). req.session.user is logged-in user string.
|
||||
// If template engine confuses them, removing session.user from this context might help.
|
||||
// item-partial doesn't use session.user.
|
||||
// Note: If anything fails, it prints literal code, so we ensure no collision.
|
||||
if (data.session.user) delete data.session.user;
|
||||
// Templates use session.user for matching favorites. We must preserve it.
|
||||
// if (data.session.user) delete data.session.user; // REMOVED THIS
|
||||
} else {
|
||||
data.session = false;
|
||||
}
|
||||
@@ -103,6 +102,12 @@ export default (router, tpl) => {
|
||||
link: data.link
|
||||
});
|
||||
|
||||
// Render pagination
|
||||
const paginationHtml = tpl.render('snippets/pagination', {
|
||||
pagination: data.pagination,
|
||||
link: data.link
|
||||
});
|
||||
|
||||
const hasMore = data.pagination.next !== null;
|
||||
|
||||
return res.reply({
|
||||
@@ -110,6 +115,7 @@ export default (router, tpl) => {
|
||||
body: JSON.stringify({
|
||||
success: true,
|
||||
html: itemsHtml,
|
||||
pagination: paginationHtml,
|
||||
hasMore: hasMore,
|
||||
nextPage: data.pagination.next,
|
||||
currentPage: data.pagination.page
|
||||
|
||||
Reference in New Issue
Block a user