From 1974abeb989fa7c4acb8dfa2f74a013c9fdba478 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 30 May 2023 19:25:13 -0400 Subject: [PATCH] fix: topic count in tools after purge closes #11651 --- public/src/client/category/tools.js | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/public/src/client/category/tools.js b/public/src/client/category/tools.js index b941e398bc..b98ef26c80 100644 --- a/public/src/client/category/tools.js +++ b/public/src/client/category/tools.js @@ -22,17 +22,17 @@ define('forum/category/tools', [ }); components.get('topic/delete').on('click', function () { - categoryCommand('del', '/state', 'delete', onDeletePurgeComplete); + categoryCommand('del', '/state', 'delete', onDeleteRestoreComplete); return false; }); components.get('topic/restore').on('click', function () { - categoryCommand('put', '/state', 'restore', onDeletePurgeComplete); + categoryCommand('put', '/state', 'restore', onDeleteRestoreComplete); return false; }); components.get('topic/purge').on('click', function () { - categoryCommand('del', '', 'purge', onDeletePurgeComplete); + categoryCommand('del', '', 'purge', onPurgeComplete); return false; }); @@ -186,7 +186,7 @@ define('forum/category/tools', [ }; function closeDropDown() { - $('.thread-tools.open').find('.dropdown-toggle').trigger('click'); + $('.thread-tools .show').removeClass('show'); } function onCommandComplete() { @@ -194,11 +194,17 @@ define('forum/category/tools', [ topicSelect.unselectAll(); } - function onDeletePurgeComplete() { + function onDeleteRestoreComplete() { closeDropDown(); updateDropdownOptions(); } + function onPurgeComplete() { + closeDropDown(); + topicSelect.unselectAll(); + updateDropdownOptions(); + } + function updateDropdownOptions() { const tids = topicSelect.getSelectedTids(); const isAnyDeleted = isAny(isTopicDeleted, tids); @@ -210,7 +216,7 @@ define('forum/category/tools', [ components.get('topic/delete').toggleClass('hidden', isAnyDeleted); components.get('topic/restore').toggleClass('hidden', isAnyScheduled || !isAnyDeleted); - components.get('topic/purge').toggleClass('hidden', !areAllDeleted); + components.get('topic/purge').toggleClass('hidden', !areAllDeleted || !tids.length); components.get('topic/lock').toggleClass('hidden', isAnyLocked); components.get('topic/unlock').toggleClass('hidden', !isAnyLocked);