From f08bbc92ac213f8bd75ef28dcb508327936692ca Mon Sep 17 00:00:00 2001
From: Matthias Schmidt <gravatronics@live.com>
Date: Mon, 7 Oct 2019 18:09:28 +0200
Subject: [PATCH] Add `IFormField::getJavaScriptDataHandlerModule()`

---
 .../templates/__formFieldDataHandler.tpl            |  4 ++--
 .../files/acp/templates/__formFieldDataHandler.tpl  |  4 ++--
 .../form/builder/field/AbstractFormField.class.php  | 13 +++++++++----
 .../system/form/builder/field/IFormField.class.php  |  8 ++++++++
 4 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/com.woltlab.wcf/templates/__formFieldDataHandler.tpl b/com.woltlab.wcf/templates/__formFieldDataHandler.tpl
index 83b9800f29..13643bdb70 100644
--- a/com.woltlab.wcf/templates/__formFieldDataHandler.tpl
+++ b/com.woltlab.wcf/templates/__formFieldDataHandler.tpl
@@ -1,7 +1,7 @@
-{if $field->getDocument()->isAjax() && !$javaScriptDataHandlerModule|empty}
+{if $field->getDocument()->isAjax() && !$field->getJavaScriptDataHandlerModule()|empty}
 	<script data-relocate="true">
 		require([
-			'{$javaScriptDataHandlerModule}{if $field|is_subclass_of:'wcf\system\form\builder\field\II18nFormField' && $field->isI18n()}I18n{/if}',
+			'{$field->getJavaScriptDataHandlerModule()}',
 			'WoltLabSuite/Core/Form/Builder/Manager'
 		], function(
 			FormBuilderField,
diff --git a/wcfsetup/install/files/acp/templates/__formFieldDataHandler.tpl b/wcfsetup/install/files/acp/templates/__formFieldDataHandler.tpl
index d4651bd1c2..13643bdb70 100644
--- a/wcfsetup/install/files/acp/templates/__formFieldDataHandler.tpl
+++ b/wcfsetup/install/files/acp/templates/__formFieldDataHandler.tpl
@@ -1,7 +1,7 @@
-{if $field->getDocument()->isAjax() && !$javaScriptDataHandlerModule|empty}
+{if $field->getDocument()->isAjax() && !$field->getJavaScriptDataHandlerModule()|empty}
 	<script data-relocate="true">
 		require([
-			'{$javaScriptDataHandlerModule}',
+			'{$field->getJavaScriptDataHandlerModule()}',
 			'WoltLabSuite/Core/Form/Builder/Manager'
 		], function(
 			FormBuilderField,
diff --git a/wcfsetup/install/files/lib/system/form/builder/field/AbstractFormField.class.php b/wcfsetup/install/files/lib/system/form/builder/field/AbstractFormField.class.php
index 3d546d088e..4ebcadc442 100644
--- a/wcfsetup/install/files/lib/system/form/builder/field/AbstractFormField.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/field/AbstractFormField.class.php
@@ -101,8 +101,7 @@ abstract class AbstractFormField implements IFormField {
 			$this->templateName,
 			'wcf',
 			array_merge($this->getHtmlVariables(), [
-				'field' => $this,
-				'javaScriptDataHandlerModule' => $this->javaScriptDataHandlerModule
+				'field' => $this
 			]),
 			true
 		);
@@ -120,13 +119,19 @@ abstract class AbstractFormField implements IFormField {
 			'__formField',
 			'wcf',
 			array_merge($this->getHtmlVariables(), [
-				'field' => $this,
-				'javaScriptDataHandlerModule' => $this->javaScriptDataHandlerModule
+				'field' => $this
 			]),
 			true
 		);
 	}
 	
+	/**
+	 * @inheritDoc
+	 */
+	public function getJavaScriptDataHandlerModule() {
+		return $this->javaScriptDataHandlerModule;
+	}
+	
 	/**
 	 * @inheritDoc
 	 */
diff --git a/wcfsetup/install/files/lib/system/form/builder/field/IFormField.class.php b/wcfsetup/install/files/lib/system/form/builder/field/IFormField.class.php
index f18122fa99..0863de42d8 100644
--- a/wcfsetup/install/files/lib/system/form/builder/field/IFormField.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/field/IFormField.class.php
@@ -40,6 +40,14 @@ interface IFormField extends IFormChildNode, IFormElement {
 	 */
 	public function getFieldHtml();
 	
+	/**
+	 * Returns the name of the JavaScript data handler module for this form field or `null` if
+	 * there is no such module.
+	 * 
+	 * @return	null|string
+	 */
+	public function getJavaScriptDataHandlerModule();
+	
 	/**
 	 * Returns the name of the object property this field represents.
 	 * 
-- 
2.20.1