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

Merge remote-tracking branch 'origin/master' into webserver.js-refactor

Browse Source 
Conflicts:
	public/templates/accountposts.tpl
	public/templates/header.tpl
This commit is contained in:
psychobunny
2014-03-04 17:52:15 -05:00
parent 552eb78db8 76d8d09f9b
commit 3614211f0e
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
public/src/forum/admin/index.js
View File

@@ -45,6 +45,7 @@ define(function() {
for(var key in data) {
uniqueVisitors.find('#' + key).text(data[key]);
}
});
};

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

@@ -12,8 +12,8 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
$(window).on('action:ajaxify.start', function(ev, data) {
if(data.url.indexOf('topic') !== 0) {
$('.pagination-block').addClass('hide');
$('#header-topic-title').html('').hide();
$('.pagination-block').addClass('hidden');
$('.header-topic-title').find('span').text('').hide();
app.removeAlert('bookmark');
}
});
@@ -286,7 +286,7 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
set_follow_state(state, false);
});
$('.posts .follow').on('click', function() {
$('.posts').on('click', '.follow', function() {
socket.emit('topics.follow', tid, function(err, state) {
if(err) {
return app.alert({
@@ -342,7 +342,7 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
function enableInfiniteLoading() {
if(!config.usePagination) {
$('.pagination-block').removeClass('hide');
$('.pagination-block').removeClass('hidden');
app.enableInfiniteLoading(function(direction) {
@@ -372,7 +372,7 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
}
});
} else {
$('.pagination-block').addClass('hide');
$('.pagination-block').addClass('hidden');
pagination.init(currentPage, pageCount);
}
@@ -1026,9 +1026,9 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
});
if($(window).scrollTop() > 50) {
$('#header-topic-title').text(templates.get('topic_name')).show();
$('.header-topic-title').find('span').text(templates.get('topic_name')).show();
} else {
$('#header-topic-title').text('').hide();
$('.header-topic-title').find('span').text('').hide();
}
$($('.posts > .post-row').get().reverse()).each(function() {