hyperzlib
/
nodebb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed pagination, and loading of template blocks on cold load (temp solution)

Browse Source
v1.18.x
psychobunny 11 years ago
parent 6ea4d89edc
commit 857df86726
10 changed files with 208 additions and 171 deletions
Show Stats Download Patch File Download Diff File

9
public/src/forum/account.js
Unescape Escape View File

@ -74,9 +74,12 @@ define(['forum/accountheader'], function(header) {
socket.emit('user.isOnline', theirid, Account.handleUserOnline); socket.emit('user.isOnline', theirid, Account.handleUserOnline);
socket.on('event:new_post', function(data) { socket.on('event:new_post', function(data) {
var html = templates.prepare(templates['account'].blocks['posts']).parse(data); templates.preload_template('account', function() {
$('.user-recent-posts').prepend(html); templates['account'].parse({posts:[]});
$('.user-recent-posts span.timeago').timeago(); var html = templates.prepare(templates['account'].blocks['posts']).parse(data);
$('.user-recent-posts').prepend(html);
$('.user-recent-posts span.timeago').timeago();
});
}); });
}); });

31
public/src/forum/accountposts.js
Unescape Escape View File

@ -34,20 +34,23 @@ define(['forum/accountheader'], function(header) {
} }
function onTopicsLoaded(posts) { function onTopicsLoaded(posts) {
var html = templates.prepare(templates['accountposts'].blocks['posts']).parse({ templates.preload_template('accountposts', function() {
posts: posts templates['accountposts'].parse(posts: []);
}); var html = templates.prepare(templates['accountposts'].blocks['posts']).parse({
posts: posts
translator.translate(html, function(translatedHTML) { });
$('#category-no-topics').remove(); translator.translate(html, function(translatedHTML) {
html = $(translatedHTML); $('#category-no-topics').remove();
html.find('img').addClass('img-responsive');
$('.user-favourite-posts').append(html); html = $(translatedHTML);
$('span.timeago').timeago(); html.find('img').addClass('img-responsive');
app.createUserTooltips(); $('.user-favourite-posts').append(html);
app.makeNumbersHumanReadable(html.find('.human-readable-number')); $('span.timeago').timeago();
app.createUserTooltips();
app.makeNumbersHumanReadable(html.find('.human-readable-number'));
});
}); });
} }

17
public/src/forum/admin/categories.js
Unescape Escape View File

@ -117,14 +117,17 @@ define(['uploader'], function(uploader) {
timeout: 2000 timeout: 2000
}); });
var html = templates.prepare(templates['admin/categories'].blocks['categories']).parse({ templates.preload_template('admin/categories', function() {
categories: [data] templates['admin/categories'].parse({categories:[]});
var html = templates.prepare(templates['admin/categories'].blocks['categories']).parse({
categories: [data]
});
html = $(html);
html.find('[data-name="bgColor"], [data-name="color"]').each(enableColorPicker);
$('#entry-container').append(html);
$('#new-category-modal').modal('hide');
}); });
html = $(html);
html.find('[data-name="bgColor"], [data-name="color"]').each(enableColorPicker);
$('#entry-container').append(html);
$('#new-category-modal').modal('hide');
}); });
} }

23
public/src/forum/admin/topics.js
Unescape Escape View File

@ -62,20 +62,23 @@ define(function() {
var btnEl = $('#topics_loadmore'); var btnEl = $('#topics_loadmore');
if (topics.length > 0) { if (topics.length > 0) {
var html = templates.prepare(templates['admin/topics'].blocks['topics']).parse({ templates.preload_template('admin/topics', function() {
topics: topics templates['admin/topics'].parse({topics:[]});
}), var html = templates.prepare(templates['admin/topics'].blocks['topics']).parse({
topicsListEl = $('.topics'); topics: topics
}),
topicsListEl = $('.topics');
// Fix relative paths // Fix relative paths
html = html.replace(/\{relative_path\}/g, RELATIVE_PATH); html = html.replace(/\{relative_path\}/g, RELATIVE_PATH);
topicsListEl.html(topicsListEl.html() + html); topicsListEl.html(topicsListEl.html() + html);
Topics.resolveButtonStates(); Topics.resolveButtonStates();
btnEl.html('Load More Topics'); btnEl.html('Load More Topics');
$('span.timeago').timeago(); $('span.timeago').timeago();
});
} else { } else {
// Exhausted all topics // Exhausted all topics
btnEl.addClass('disabled'); btnEl.addClass('disabled');

62
public/src/forum/admin/users.js
Unescape Escape View File

@ -190,27 +190,30 @@ define(function() {
return app.alertError(err.message); return app.alertError(err.message);
} }
var html = templates.prepare(templates['admin/users'].blocks['users']).parse({ templates.preload_template('admin/users', function() {
users: data.users templates['admin/users'].parse({users:[]});
}), var html = templates.prepare(templates['admin/users'].blocks['users']).parse({
userListEl = document.querySelector('.users'); users: data.users
}),
userListEl.innerHTML = html; userListEl = document.querySelector('.users');
$('.fa-spinner').addClass('none');
userListEl.innerHTML = html;
if (data && data.users.length === 0) { $('.fa-spinner').addClass('none');
$('#user-notfound-notify').html('User not found!')
.show() if (data && data.users.length === 0) {
.addClass('label-danger') $('#user-notfound-notify').html('User not found!')
.removeClass('label-success'); .show()
} else { .addClass('label-danger')
$('#user-notfound-notify').html(data.users.length + ' user' + (data.users.length > 1 ? 's' : '') + ' found! Search took ' + data.timing + ' ms.') .removeClass('label-success');
.show() } else {
.addClass('label-success') $('#user-notfound-notify').html(data.users.length + ' user' + (data.users.length > 1 ? 's' : '') + ' found! Search took ' + data.timing + ' ms.')
.removeClass('label-danger'); .show()
} .addClass('label-success')
.removeClass('label-danger');
updateButtons(); }
updateButtons();
});
}); });
}, 250); }, 250);
}); });
@ -220,14 +223,17 @@ define(function() {
handleUserCreate(); handleUserCreate();
function onUsersLoaded(users) { function onUsersLoaded(users) {
var html = templates.prepare(templates['admin/users'].blocks['users']).parse({ templates.preload_template('admin/users', function() {
users: users templates['admin/users'].parse({users:[]});
}); var html = templates.prepare(templates['admin/users'].blocks['users']).parse({
html = $(html); users: users
$('#users-container').append(html); });
html = $(html);
$('#users-container').append(html);
updateUserBanButtons(html.find('.ban-btn')); updateUserBanButtons(html.find('.ban-btn'));
updateUserAdminButtons(html.find('.admin-btn')); updateUserAdminButtons(html.find('.admin-btn'));
});
} }
function loadMoreUsers() { function loadMoreUsers() {

113
public/src/forum/category.js
Unescape Escape View File

@ -162,45 +162,47 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
Category.onNewTopic = function(data) { Category.onNewTopic = function(data) {
$(window).trigger('filter:categories.new_topic', data); $(window).trigger('filter:categories.new_topic', data);
templates.preload_template('category', function() {
templates['category'].parse({topics:[]});
var html = templates.prepare(templates['category'].blocks['topics']).parse({
topics: [data]
});
var html = templates.prepare(templates['category'].blocks['topics']).parse({ translator.translate(html, function(translatedHTML) {
topics: [data] var topic = $(translatedHTML),
}); container = $('#topics-container'),
topics = $('#topics-container').children('.category-item'),
translator.translate(html, function(translatedHTML) { numTopics = topics.length;
var topic = $(translatedHTML),
container = $('#topics-container'), $('#topics-container, .category-sidebar').removeClass('hidden');
topics = $('#topics-container').children('.category-item'), $('#category-no-topics').remove();
numTopics = topics.length;
if (numTopics > 0) {
$('#topics-container, .category-sidebar').removeClass('hidden'); for (var x = 0; x < numTopics; x++) {
$('#category-no-topics').remove(); if ($(topics[x]).find('.fa-thumb-tack').length) {
if(x === numTopics - 1) {
if (numTopics > 0) { topic.insertAfter(topics[x]);
for (var x = 0; x < numTopics; x++) { }
if ($(topics[x]).find('.fa-thumb-tack').length) { continue;
if(x === numTopics - 1) {
topic.insertAfter(topics[x]);
} }
continue; topic.insertBefore(topics[x]);
break;
} }
topic.insertBefore(topics[x]); } else {
break; container.append(topic);
} }
} else {
container.append(topic);
}
topic.hide().fadeIn('slow'); topic.hide().fadeIn('slow');
socket.emit('categories.getPageCount', templates.get('category_id'), function(err, newPageCount) { socket.emit('categories.getPageCount', templates.get('category_id'), function(err, newPageCount) {
pagination.recreatePaginationLinks(newPageCount); pagination.recreatePaginationLinks(newPageCount);
}); });
topic.find('span.timeago').timeago(); topic.find('span.timeago').timeago();
app.createUserTooltips(); app.createUserTooltips();
$(window).trigger('action:categories.new_topic.loaded'); $(window).trigger('action:categories.new_topic.loaded');
});
}); });
}; };
@ -239,36 +241,39 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
findInsertionPoint(); findInsertionPoint();
var html = templates.prepare(templates['category'].blocks['topics']).parse({ templates.preload_template('category', function() {
topics: topics templates['category'].parse({topics:[]});
}); var html = templates.prepare(templates['category'].blocks['topics']).parse({
topics: topics
});
translator.translate(html, function(translatedHTML) { translator.translate(html, function(translatedHTML) {
var container = $('#topics-container'), var container = $('#topics-container'),
html = $(translatedHTML); html = $(translatedHTML);
$('#topics-container, .category-sidebar').removeClass('hidden'); $('#topics-container, .category-sidebar').removeClass('hidden');
$('#category-no-topics').remove(); $('#category-no-topics').remove();
if(config.usePagination) { if(config.usePagination) {
container.empty().append(html); container.empty().append(html);
} else {
if(after) {
html.insertAfter(after);
} else if(before) {
html.insertBefore(before);
} else { } else {
container.append(html); if(after) {
html.insertAfter(after);
} else if(before) {
html.insertBefore(before);
} else {
container.append(html);
}
} }
}
html.find('span.timeago').timeago(); html.find('span.timeago').timeago();
app.createUserTooltips(); app.createUserTooltips();
app.makeNumbersHumanReadable(html.find('.human-readable-number')); app.makeNumbersHumanReadable(html.find('.human-readable-number'));
if (typeof callback === 'function') { if (typeof callback === 'function') {
callback(topics); callback(topics);
} }
});
}); });
}; };

31
public/src/forum/favourites.js
Unescape Escape View File

@ -33,20 +33,23 @@ define(['forum/accountheader'], function(header) {
} }
function onTopicsLoaded(posts) { function onTopicsLoaded(posts) {
var html = templates.prepare(templates['favourites'].blocks['posts']).parse({ templates.preload_template('favourites', function() {
posts: posts templates['favourites'].parse({posts:[]});
}); var html = templates.prepare(templates['favourites'].blocks['posts']).parse({
posts: posts
translator.translate(html, function(translatedHTML) { });
$('#category-no-topics').remove(); translator.translate(html, function(translatedHTML) {
html = $(translatedHTML); $('#category-no-topics').remove();
html.find('img').addClass('img-responsive');
$('.user-favourite-posts').append(html); html = $(translatedHTML);
$('span.timeago').timeago(); html.find('img').addClass('img-responsive');
app.createUserTooltips(); $('.user-favourite-posts').append(html);
app.makeNumbersHumanReadable(html.find('.human-readable-number')); $('span.timeago').timeago();
app.createUserTooltips();
app.makeNumbersHumanReadable(html.find('.human-readable-number'));
});
}); });
} }

29
public/src/forum/recent.js
Unescape Escape View File

@ -116,19 +116,22 @@ define(function() {
} }
Recent.onTopicsLoaded = function(template, topics) { Recent.onTopicsLoaded = function(template, topics) {
var html = templates.prepare(templates[template].blocks['topics']).parse({ templates.preload_template(template, function() {
topics: topics templates[template].parse({topics:[]});
}); var html = templates.prepare(templates[template].blocks['topics']).parse({
topics: topics
translator.translate(html, function(translatedHTML) { });
$('#category-no-topics').remove(); translator.translate(html, function(translatedHTML) {
html = $(translatedHTML); $('#category-no-topics').remove();
$('#topics-container').append(html);
$('span.timeago').timeago(); html = $(translatedHTML);
app.createUserTooltips(); $('#topics-container').append(html);
app.makeNumbersHumanReadable(html.find('.human-readable-number')); $('span.timeago').timeago();
app.createUserTooltips();
app.makeNumbersHumanReadable(html.find('.human-readable-number'));
});
}); });
} }

7
public/src/forum/topic.js
Unescape Escape View File

@ -1233,8 +1233,11 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
} }
function parseAndTranslatePosts(data, callback) { function parseAndTranslatePosts(data, callback) {
var html = templates.prepare(templates['topic'].blocks['posts']).parse(data); templates.preload_template('topic', function() {
translator.translate(html, callback); templates['topic'].parse({posts: []});
var html = templates.prepare(templates['topic'].blocks['posts']).parse(data);
translator.translate(html, callback);
});
} }

55
public/src/forum/users.js
Unescape Escape View File

@ -59,22 +59,24 @@ define(function() {
return; return;
} }
var html = templates.prepare(templates['users'].blocks['users']).parse({ templates.preload_template('users', function() {
users: data.users templates['users'].parse({users:[]});
}), var html = templates.prepare(templates['users'].blocks['users']).parse({
userListEl = $('#users-container'); users: data.users
}),
userListEl.html(html); userListEl = $('#users-container');
userListEl.html(html);
if (data && data.users.length === 0) {
$('#user-notfound-notify').html('User not found!');
$('#user-notfound-notify').parent().addClass('btn-warning label-warning'); if (data && data.users.length === 0) {
} else { $('#user-notfound-notify').html('User not found!');
$('#user-notfound-notify').html(data.users.length + ' user' + (data.users.length > 1 ? 's' : '') + ' found! Search took ' + data.timing + ' ms.'); $('#user-notfound-notify').parent().addClass('btn-warning label-warning');
$('#user-notfound-notify').parent().addClass('btn-success label-success'); } else {
} $('#user-notfound-notify').html(data.users.length + ' user' + (data.users.length > 1 ? 's' : '') + ' found! Search took ' + data.timing + ' ms.');
$('#user-notfound-notify').parent().addClass('btn-success label-success');
}
});
}); });
}, 500); //replace this with global throttling function/constant }, 500); //replace this with global throttling function/constant
@ -108,17 +110,20 @@ define(function() {
} }
function onUsersLoaded(users, emptyContainer) { function onUsersLoaded(users, emptyContainer) {
var html = templates.prepare(templates['users'].blocks['users']).parse({ templates.preload_template('users', function() {
users: users templates['useres'].parse({users:[]});
}); var html = templates.prepare(templates['users'].blocks['users']).parse({
users: users
});
translator.translate(html, function(translated) { translator.translate(html, function(translated) {
if(emptyContainer) { if(emptyContainer) {
$('#users-container .registered-user').remove(); $('#users-container .registered-user').remove();
} }
$('#users-container').append(translated); $('#users-container').append(translated);
$('#users-container .anon-user').appendTo($('#users-container')); $('#users-container .anon-user').appendTo($('#users-container'));
});
}); });
} }

Write Preview
Loading…
Cancel
Save