From: Alexander Ebert <ebert@woltlab.com>
Date: Sun, 8 Oct 2023 15:58:56 +0000 (+0200)
Subject: Deprecate the legacy label chooser
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=bb84eed009324fb907c4b13c4c21005a8eaa7e9e;p=GitHub%2FWoltLab%2FWCF.git

Deprecate the legacy label chooser
---

diff --git a/com.woltlab.wcf/templates/__labelSelection.tpl b/com.woltlab.wcf/templates/__labelSelection.tpl
index 89fbb841d2..6e06afe13a 100644
--- a/com.woltlab.wcf/templates/__labelSelection.tpl
+++ b/com.woltlab.wcf/templates/__labelSelection.tpl
@@ -1,3 +1,4 @@
+{* @deprecated 6.1 Use the new `__labelPickerGroup` template instead. *}
 {foreach from=$labelGroups item=labelGroup}
 	{if $labelGroup|count}
 		<dt><label>{$labelGroup->getTitle()}</label></dt>
diff --git a/com.woltlab.wcf/templates/categoryArticleList.tpl b/com.woltlab.wcf/templates/categoryArticleList.tpl
index 12411e94f4..f41a7f9ca7 100644
--- a/com.woltlab.wcf/templates/categoryArticleList.tpl
+++ b/com.woltlab.wcf/templates/categoryArticleList.tpl
@@ -36,7 +36,7 @@
 				
 				<div class="boxContent">
 					<dl>
-						{include file='__labelSelection'}
+						{include file='__labelPickerGroup'}
 					</dl>
 					<div class="formSubmit">
 						<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
@@ -44,17 +44,6 @@
 				</div>
 			</section>
 		</form>
-		
-		<script data-relocate="true">
-			$(function() {
-				WCF.Language.addObject({
-					'wcf.label.none': '{jslang}wcf.label.none{/jslang}',
-					'wcf.label.withoutSelection': '{jslang}wcf.label.withoutSelection{/jslang}'
-				});
-				
-				new WCF.Label.Chooser({ {implode from=$labelIDs key=groupID item=labelID}{@$groupID}: {@$labelID}{/implode} }, '#sidebarForm', undefined, true);
-			});
-		</script>
 	{/if}
 {/capture}
 
diff --git a/com.woltlab.wcf/templates/unreadArticleList.tpl b/com.woltlab.wcf/templates/unreadArticleList.tpl
index 140321095b..0377ded782 100644
--- a/com.woltlab.wcf/templates/unreadArticleList.tpl
+++ b/com.woltlab.wcf/templates/unreadArticleList.tpl
@@ -17,7 +17,7 @@
 				
 				<div class="boxContent">
 					<dl>
-						{include file='__labelSelection'}
+						{include file='__labelPickerGroup'}
 					</dl>
 					<div class="formSubmit">
 						<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
@@ -25,17 +25,6 @@
 				</div>
 			</section>
 		</form>
-		
-		<script data-relocate="true">
-			$(function() {
-				WCF.Language.addObject({
-					'wcf.label.none': '{jslang}wcf.label.none{/jslang}',
-					'wcf.label.withoutSelection': '{jslang}wcf.label.withoutSelection{/jslang}'
-				});
-				
-				new WCF.Label.Chooser({ {implode from=$labelIDs key=groupID item=labelID}{@$groupID}: {@$labelID}{/implode} }, '#sidebarForm', undefined, true);
-			});
-		</script>
 	{/if}
 {/capture}
 
diff --git a/com.woltlab.wcf/templates/watchedArticleList.tpl b/com.woltlab.wcf/templates/watchedArticleList.tpl
index 179cf69758..4c622eb302 100644
--- a/com.woltlab.wcf/templates/watchedArticleList.tpl
+++ b/com.woltlab.wcf/templates/watchedArticleList.tpl
@@ -15,7 +15,7 @@
 				
 				<div class="boxContent">
 					<dl>
-						{include file='__labelSelection'}
+						{include file='__labelPickerGroup'}
 					</dl>
 					<div class="formSubmit">
 						<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
@@ -23,17 +23,6 @@
 				</div>
 			</section>
 		</form>
-		
-		<script data-relocate="true">
-			$(function() {
-				WCF.Language.addObject({
-					'wcf.label.none': '{jslang}wcf.label.none{/jslang}',
-					'wcf.label.withoutSelection': '{jslang}wcf.label.withoutSelection{/jslang}'
-				});
-				
-				new WCF.Label.Chooser({ {implode from=$labelIDs key=groupID item=labelID}{@$groupID}: {@$labelID}{/implode} }, '#sidebarForm', undefined, true);
-			});
-		</script>
 	{/if}
 {/capture}
 
diff --git a/wcfsetup/install/files/js/WCF.Label.js b/wcfsetup/install/files/js/WCF.Label.js
index d62a2ad594..cd8c2c83af 100644
--- a/wcfsetup/install/files/js/WCF.Label.js
+++ b/wcfsetup/install/files/js/WCF.Label.js
@@ -12,6 +12,7 @@ WCF.Label = {};
  * @param	string		containerSelector
  * @param	string		submitButtonSelector
  * @param	boolean		showWithoutSelection
+ * @deprecated 6.1 Use the new `LabelPicker` PHP API
  */
 WCF.Label.Chooser = Class.extend({
 	/**