Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-01-09 09:02:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Julian Lam
2014-02-21 11:16:46 -05:00
parent d3ba03ceae 15f19653c5
commit 790b0f98d4
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);

2
public/src/forum/category.js
View File

@@ -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');
});
}