From 196722ce54a633265c34d53d0bd63a6b4a6dcb18 Mon Sep 17 00:00:00 2001
From: Matthias Schmidt <gravatronics@live.com>
Date: Sun, 10 Mar 2019 15:11:53 +0100
Subject: [PATCH] Change `WysiwygSmileyFormField` to `WysiwygSmileyFormNode`

See #2852
---
 .../templates/__wysiwygSmileyFormNode.tpl     |  2 +-
 syncTemplates.json                            |  2 +-
 .../acp/templates/__wysiwygSmileyFormNode.tpl |  0
 .../WysiwygSmileyFormContainer.class.php      |  4 +--
 .../WysiwygSmileyFormNode.class.php}          | 31 +++++++++++++++----
 5 files changed, 29 insertions(+), 10 deletions(-)
 rename wcfsetup/install/files/acp/templates/__wysiwygSmileyFormField.tpl => com.woltlab.wcf/templates/__wysiwygSmileyFormNode.tpl (76%)
 rename com.woltlab.wcf/templates/__wysiwygSmileyFormField.tpl => wcfsetup/install/files/acp/templates/__wysiwygSmileyFormNode.tpl (100%)
 rename wcfsetup/install/files/lib/system/form/builder/{field/wysiwyg/WysiwygSmileyFormField.class.php => wysiwyg/WysiwygSmileyFormNode.class.php} (70%)

diff --git a/wcfsetup/install/files/acp/templates/__wysiwygSmileyFormField.tpl b/com.woltlab.wcf/templates/__wysiwygSmileyFormNode.tpl
similarity index 76%
rename from wcfsetup/install/files/acp/templates/__wysiwygSmileyFormField.tpl
rename to com.woltlab.wcf/templates/__wysiwygSmileyFormNode.tpl
index 422140bc01..eb8d7e6539 100644
--- a/wcfsetup/install/files/acp/templates/__wysiwygSmileyFormField.tpl
+++ b/com.woltlab.wcf/templates/__wysiwygSmileyFormNode.tpl
@@ -1,5 +1,5 @@
 <ul class="inlineList smileyList">
-	{foreach from=$field->getSmilies() item=smiley}
+	{foreach from=$node->getSmilies() item=smiley}
 		<li><a title="{lang}{$smiley->smileyTitle}{/lang}" class="jsTooltip jsSmiley">{@$smiley->getHtml()}</a></li>
 	{/foreach}
 </ul>
diff --git a/syncTemplates.json b/syncTemplates.json
index 28fabe23a5..f98b8e2307 100644
--- a/syncTemplates.json
+++ b/syncTemplates.json
@@ -45,7 +45,7 @@
     "__wysiwygFormField",
     "__wysiwygPreviewFormButton",
     "__wysiwygSmileyFormContainer",
-    "__wysiwygSmileyFormField",
+    "__wysiwygSmileyFormNode",
     "aclPermissionJavaScript",
     "articleAdd",
     "articleAddDialog",
diff --git a/com.woltlab.wcf/templates/__wysiwygSmileyFormField.tpl b/wcfsetup/install/files/acp/templates/__wysiwygSmileyFormNode.tpl
similarity index 100%
rename from com.woltlab.wcf/templates/__wysiwygSmileyFormField.tpl
rename to wcfsetup/install/files/acp/templates/__wysiwygSmileyFormNode.tpl
diff --git a/wcfsetup/install/files/lib/system/form/builder/container/wysiwyg/WysiwygSmileyFormContainer.class.php b/wcfsetup/install/files/lib/system/form/builder/container/wysiwyg/WysiwygSmileyFormContainer.class.php
index f3a6406f0d..f80198aef3 100644
--- a/wcfsetup/install/files/lib/system/form/builder/container/wysiwyg/WysiwygSmileyFormContainer.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/container/wysiwyg/WysiwygSmileyFormContainer.class.php
@@ -4,7 +4,7 @@ use wcf\data\smiley\SmileyCache;
 use wcf\system\form\builder\container\FormContainer;
 use wcf\system\form\builder\container\TabFormContainer;
 use wcf\system\form\builder\container\TabTabMenuFormContainer;
-use wcf\system\form\builder\field\wysiwyg\WysiwygSmileyFormField;
+use wcf\system\form\builder\wysiwyg\WysiwygSmileyFormNode;
 use wcf\system\form\builder\TWysiwygFormNode;
 use wcf\util\StringUtil;
 
@@ -55,7 +55,7 @@ class WysiwygSmileyFormContainer extends TabTabMenuFormContainer {
 							FormContainer::create($this->getId() . '_smileyCategoryContainer' . $smileyCategory->categoryID)
 								->removeClass('section')
 								->appendChild(
-									WysiwygSmileyFormField::create($this->getId() . '_smileyCategory' . $smileyCategory->categoryID)
+									WysiwygSmileyFormNode::create($this->getId() . '_smileyCategory' . $smileyCategory->categoryID)
 										->smilies(SmileyCache::getInstance()->getCategorySmilies($smileyCategory->categoryID ?: null))
 								)
 						)
diff --git a/wcfsetup/install/files/lib/system/form/builder/field/wysiwyg/WysiwygSmileyFormField.class.php b/wcfsetup/install/files/lib/system/form/builder/wysiwyg/WysiwygSmileyFormNode.class.php
similarity index 70%
rename from wcfsetup/install/files/lib/system/form/builder/field/wysiwyg/WysiwygSmileyFormField.class.php
rename to wcfsetup/install/files/lib/system/form/builder/wysiwyg/WysiwygSmileyFormNode.class.php
index 582da24052..46b419f7ef 100644
--- a/wcfsetup/install/files/lib/system/form/builder/field/wysiwyg/WysiwygSmileyFormField.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/wysiwyg/WysiwygSmileyFormNode.class.php
@@ -1,7 +1,10 @@
 <?php
-namespace wcf\system\form\builder\field\wysiwyg;
+namespace wcf\system\form\builder\wysiwyg;
 use wcf\data\smiley\Smiley;
-use wcf\system\form\builder\field\AbstractFormField;
+use wcf\system\form\builder\IFormChildNode;
+use wcf\system\form\builder\TFormChildNode;
+use wcf\system\form\builder\TFormNode;
+use wcf\system\WCF;
 
 /**
  * Implementation of a form field for the list smilies of a certain category used by a wysiwyg
@@ -15,7 +18,12 @@ use wcf\system\form\builder\field\AbstractFormField;
  * @package	WoltLabSuite\Core\System\Form\Builder\Field
  * @since	5.2
  */
-class WysiwygSmileyFormField extends AbstractFormField {
+class WysiwygSmileyFormNode implements IFormChildNode {
+	use TFormChildNode;
+	use TFormNode {
+		isAvailable as traitIsAvailable;
+	}
+	
 	/**
 	 * list of available smilies
 	 * @var	Smiley[]
@@ -25,7 +33,11 @@ class WysiwygSmileyFormField extends AbstractFormField {
 	/**
 	 * @inheritDoc
 	 */
-	protected $templateName = '__wysiwygSmileyFormField';
+	public function getHtml() {
+		return WCF::getTPL()->fetch('__wysiwygSmileyFormNode', 'wcf', [
+			'node' => $this
+		]);
+	}
 	
 	/**
 	 * Returns the list of available smilies.
@@ -47,7 +59,7 @@ class WysiwygSmileyFormField extends AbstractFormField {
 	 * @inheritDoc
 	 */
 	public function isAvailable() {
-		return parent::isAvailable() && !empty($this->smilies);
+		return $this->traitIsAvailable() && !empty($this->smilies);
 	}
 	
 	/**
@@ -61,7 +73,7 @@ class WysiwygSmileyFormField extends AbstractFormField {
 	 * Sets the list of available smilies.
 	 * 
 	 * @param	Smiley[]	$smilies	available smilies
-	 * @return	WysiwygSmileyFormField		this form field
+	 * @return	WysiwygSmileyFormNode		this form field
 	 */
 	public function smilies(array $smilies) {
 		foreach ($smilies as $smiley) {
@@ -77,4 +89,11 @@ class WysiwygSmileyFormField extends AbstractFormField {
 		
 		return $this;
 	}
+	
+	/**
+	 * @inheritDoc
+	 */
+	public function validate() {
+		// does nothing
+	}
 }
-- 
2.20.1