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

Conflicts:
	public/templates/accountposts.tpl
	public/templates/header.tpl

public/src/forum/admin/index.js

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

public/src/forum/topic.js

@@ -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() {