From 5a1e558db96cb4ee53f29686fc6739fa2f950857 Mon Sep 17 00:00:00 2001
From: Matthias Schmidt <gravatronics@live.com>
Date: Sat, 16 Jan 2021 10:35:59 +0100
Subject: [PATCH] Use `WoltLabSuite/Core/Acp/Ui/Worker` instead of
 `WCF.ACP.Worker` (#3686)

Additionally, the mail worker dialogs now use titles.
---
 wcfsetup/install/files/acp/js/WCF.ACP.js      | 20 +++++++++++++------
 .../templates/sendMailUserBulkProcessing.tpl  | 11 +++++++---
 .../files/acp/templates/sitemapList.tpl       | 13 ++++++++----
 .../acp/templates/userActivityPointOption.tpl | 12 +++++++----
 .../install/files/acp/templates/userMail.tpl  | 13 ++++++++----
 5 files changed, 48 insertions(+), 21 deletions(-)

diff --git a/wcfsetup/install/files/acp/js/WCF.ACP.js b/wcfsetup/install/files/acp/js/WCF.ACP.js
index c346688027..3258d2b028 100644
--- a/wcfsetup/install/files/acp/js/WCF.ACP.js
+++ b/wcfsetup/install/files/acp/js/WCF.ACP.js
@@ -1789,12 +1789,20 @@ WCF.ACP.User.SendNewPasswordHandler = {
 	 */
 	_clipboardAction: function(actionData) {
 		if (actionData.data.actionName === 'com.woltlab.wcf.user.sendNewPassword') {
-			WCF.System.Confirmation.show(actionData.data.parameters.confirmMessage, function(action) {
-				if (action === 'confirm') {
-					new WCF.ACP.Worker('sendingNewPasswords', 'wcf\\system\\worker\\SendNewPasswordWorker', WCF.Language.get('wcf.acp.user.sendNewPassword.workerTitle'), {
-						userIDs: actionData.data.parameters.objectIDs
-					});
-				}
+			require(['Language', 'Ui/Confirmation', 'WoltLabSuite/Core/Acp/Ui/Worker'], function(Language, UiConfirmation, AcpUiWorker) {
+				UiConfirmation.show({
+					confirm: () => {
+						new AcpUiWorker({
+							dialogId: 'sendingNewPasswords',
+							dialogTitle: Language.get('wcf.acp.user.sendNewPassword.workerTitle'),
+							className: 'wcf\\system\\worker\\SendNewPasswordWorker',
+							parameters: {
+								userIDs: actionData.data.parameters.objectIDs
+							},
+						});
+					},
+					message: actionData.data.parameters.confirmMessage,
+				})
 			});
 		}
 	}
diff --git a/wcfsetup/install/files/acp/templates/sendMailUserBulkProcessing.tpl b/wcfsetup/install/files/acp/templates/sendMailUserBulkProcessing.tpl
index 9933270a0e..42081a4ae8 100644
--- a/wcfsetup/install/files/acp/templates/sendMailUserBulkProcessing.tpl
+++ b/wcfsetup/install/files/acp/templates/sendMailUserBulkProcessing.tpl
@@ -56,11 +56,16 @@
 
 {if !$mailID|empty}
 	<script data-relocate="true">
-		require(['Language'], function(Language) {
+		require(['Language', 'WoltLabSuite/Core/Acp/Ui/Worker'], function (Language, AcpUiWorker) {
 			Language.add('wcf.acp.worker.abort.confirmMessage', '{jslang}wcf.acp.worker.abort.confirmMessage{/jslang}');
 			
-			new WCF.ACP.Worker('mail', 'wcf\\system\\worker\\MailWorker', '', {
-				mailID: {@$mailID}
+			new AcpUiWorker({
+				dialogId: 'mail',
+				dialogTitle: '{jslang}wcf.acp.user.bulkProcessing.sendMail{/jslang}',
+				className: 'wcf\\system\\worker\\MailWorker',
+				parameters: {
+					mailID: {@$mailID},
+				},
 			});
 		});
 	</script>
diff --git a/wcfsetup/install/files/acp/templates/sitemapList.tpl b/wcfsetup/install/files/acp/templates/sitemapList.tpl
index 6bde07ae6f..d789e89eba 100644
--- a/wcfsetup/install/files/acp/templates/sitemapList.tpl
+++ b/wcfsetup/install/files/acp/templates/sitemapList.tpl
@@ -71,12 +71,17 @@
 {/if}
 
 <script data-relocate="true">
-	require(['Language'], function(Language) {
+	require(['Language', 'WoltLabSuite/Core/Acp/Ui/Worker'], function (Language, AcpUiWorker) {
 		Language.add('wcf.acp.worker.abort.confirmMessage', '{jslang}wcf.acp.worker.abort.confirmMessage{/jslang}');
 		
-		elById('sitemapRebuildButton').addEventListener('click', function () {
-			new WCF.ACP.Worker('sitemapRebuild', 'wcf\\system\\worker\\SitemapRebuildWorker', '{jslang}wcf.acp.rebuildData.com.woltlab.wcf.sitemap{/jslang}', {
-				forceRebuild: true
+		document.getElementById('sitemapRebuildButton').addEventListener('click', () => {
+			new AcpUiWorker({
+				dialogId: 'sitemapRebuild',
+				dialogTitle: '{jslang}wcf.acp.rebuildData.com.woltlab.wcf.sitemap{/jslang}',
+				className: 'wcf\\system\\worker\\SitemapRebuildWorker',
+				parameters: {
+					forceRebuild: true,
+				},
 			});
 		});
 	});
diff --git a/wcfsetup/install/files/acp/templates/userActivityPointOption.tpl b/wcfsetup/install/files/acp/templates/userActivityPointOption.tpl
index a1f903c61b..0dc74ac1ef 100644
--- a/wcfsetup/install/files/acp/templates/userActivityPointOption.tpl
+++ b/wcfsetup/install/files/acp/templates/userActivityPointOption.tpl
@@ -1,11 +1,15 @@
 {include file='header' pageTitle='wcf.acp.user.activityPoint.option'}
 
 <script data-relocate="true">
-	$(function() {
-		WCF.Language.add('wcf.acp.worker.abort.confirmMessage', '{jslang}wcf.acp.worker.abort.confirmMessage{/jslang}');
+	require(['Language', 'WoltLabSuite/Core/Acp/Ui/Worker'], function (Language, AcpUiWorker) {
+		Language.add('wcf.acp.worker.abort.confirmMessage', '{jslang}wcf.acp.worker.abort.confirmMessage{/jslang}');
 		
-		$('#updateEvents').click(function () {
-			new WCF.ACP.Worker('events', 'wcf\\system\\worker\\UserActivityPointUpdateEventsWorker', '{jslang}wcf.acp.user.activityPoint.updateEvents{/jslang}');
+		document.getElementById('updateEvents').addEventListener('click', () => {
+			new AcpUiWorker({
+				dialogId: 'events',
+				dialogTitle: '{jslang}wcf.acp.user.activityPoint.updateEvents{/jslang}',
+				className: 'wcf\\system\\worker\\UserActivityPointUpdateEventsWorker',
+			});
 		});
 	});
 </script>
diff --git a/wcfsetup/install/files/acp/templates/userMail.tpl b/wcfsetup/install/files/acp/templates/userMail.tpl
index f5140622ca..a9de7937d1 100644
--- a/wcfsetup/install/files/acp/templates/userMail.tpl
+++ b/wcfsetup/install/files/acp/templates/userMail.tpl
@@ -10,11 +10,16 @@
 
 {if $mailID|isset}
 	<script data-relocate="true">
-		$(function() {
-			WCF.Language.add('wcf.acp.worker.abort.confirmMessage', '{jslang}wcf.acp.worker.abort.confirmMessage{/jslang}');
+		require(['Language', 'WoltLabSuite/Core/Acp/Ui/Worker'], function (Language, AcpUiWorker) {
+			Language.add('wcf.acp.worker.abort.confirmMessage', '{lang}wcf.acp.worker.abort.confirmMessage{/lang}');
 			
-			new WCF.ACP.Worker('mail', 'wcf\\system\\worker\\MailWorker', '', {
-				mailID: {@$mailID}
+			new AcpUiWorker({
+				dialogId: 'mail',
+				dialogTitle: '{jslang}{$pageTitle}{/jslang}',
+				className: 'wcf\\system\\worker\\MailWorker',
+				parameters: {
+					mailID: {@$mailID},
+				},
 			});
 		});
 	</script>
-- 
2.20.1