Merge branch 'master' into develop

This commit is contained in:
Barış Soner Uşaklı
2025-11-17 20:25:14 -05:00
2 changed files with 5 additions and 3 deletions

View File

@@ -2,7 +2,6 @@
define('forum/category', [ define('forum/category', [
'forum/infinitescroll', 'forum/infinitescroll',
'share',
'navigator', 'navigator',
'topicList', 'topicList',
'sort', 'sort',
@@ -11,7 +10,7 @@ define('forum/category', [
'alerts', 'alerts',
'api', 'api',
'clipboard', 'clipboard',
], function (infinitescroll, share, navigator, topicList, sort, categorySelector, hooks, alerts, api, clipboard) { ], function (infinitescroll, navigator, topicList, sort, categorySelector, hooks, alerts, api, clipboard) {
const Category = {}; const Category = {};
$(window).on('action:ajaxify.start', function (ev, data) { $(window).on('action:ajaxify.start', function (ev, data) {

View File

@@ -216,9 +216,12 @@ define('topicList', [
'reputation:disabled': data['reputation:disabled'], 'reputation:disabled': data['reputation:disabled'],
template: { template: {
name: templateName, name: templateName,
[templateName]: true,
}, },
}; };
tplData.template[templateName] = true; if (ajaxify.data.cid) {
tplData.cid = ajaxify.data.cid;
}
hooks.fire('action:topics.loading', { topics: topics, after: after, before: before }); hooks.fire('action:topics.loading', { topics: topics, after: after, before: before });