Merge branch 'master' of github.com:designcreateplay/NodeBB

public/src/forum/admin/themes.js

@@ -155,6 +155,7 @@ define(['forum/admin/settings'], function(Settings) {
 			if (!el.hasClass('block')) {
 				el.addClass('block')
 					.droppable({
+						accept: '[data-container-html]',
 						drop: function(event, ui) {
 							var el = $(this);
 

public/src/forum/category.js

@@ -122,6 +122,7 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
 			return;
 		}
 
+		$(window).trigger('action:categories.loading');
 		loadingMoreTopics = true;
 		socket.emit('categories.loadMore', {
 			cid: cid,
@@ -136,6 +137,7 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
 				$('#topics-container').attr('data-nextstart', data.nextStart);
 			}
 			loadingMoreTopics = false;
+			$(window).trigger('action:categories.loaded');
 		});
 	}