From 7e767da73e9e880c4d1e8048e3ce0d58e5bd95cc Mon Sep 17 00:00:00 2001 From: psychobunny Date: Fri, 21 Feb 2014 01:54:48 -0500 Subject: [PATCH 1/2] closes #1086 and #1085 --- public/src/forum/admin/themes.js | 1 + 1 file changed, 1 insertion(+) diff --git a/public/src/forum/admin/themes.js b/public/src/forum/admin/themes.js index 78328a6027..6207b98fff 100644 --- a/public/src/forum/admin/themes.js +++ b/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); From 15f19653c5da1a503f2b37bf8386a6bd23430d65 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Fri, 21 Feb 2014 01:55:25 -0500 Subject: [PATCH 2/2] action:categories.loading and action.categories.loaded --- public/src/forum/category.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/public/src/forum/category.js b/public/src/forum/category.js index 810adaa78f..70b0bcae4e 100644 --- a/public/src/forum/category.js +++ b/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'); }); }