webasset for field.modal-fields

joomla · Jun 29, 2020 · 04f844a · 04f844a
1 parent 4d8983f
commit 04f844a
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 18 deletions.
diff --git a/administrator/components/com_categories/src/Field/Modal/CategoryField.php b/administrator/components/com_categories/src/Field/Modal/CategoryField.php
@@ -69,8 +69,11 @@ protected function getInput()
 		// Create the modal id.
 		$modalId = 'Category_' . $this->id;
 
+		/** @var \Joomla\CMS\WebAsset\WebAssetManager $wa */
+		$wa = Factory::getApplication()->getDocument()->getWebAssetManager();
+
 		// Add the modal field script to the document head.
-		HTMLHelper::_('script', 'system/fields/modal-fields.min.js', array('version' => 'auto', 'relative' => true));
+		$wa->useScript('field.modal-fields');
 
 		// Script to proxy the select modal function to the modal-fields.js file.
 		if ($allowSelect)
@@ -84,10 +87,12 @@ protected function getInput()
 
 			if (!isset($scriptSelect[$this->id]))
 			{
-				Factory::getDocument()->addScriptDeclaration("
-				function jSelectCategory_" . $this->id . "(id, title, object) {
+				$wa->addInlineScript("
+				window.jSelectCategory_" . $this->id . " = function (id, title, object) {
 					window.processModalSelect('Category', '" . $this->id . "', id, title, '', object);
-				}"
+				}",
+					[],
+					['type' => 'module']
 				);
 
 				Text::script('JGLOBAL_ASSOCIATIONS_PROPAGATE_FAILED');

diff --git a/administrator/components/com_contact/src/Field/Modal/ContactField.php b/administrator/components/com_contact/src/Field/Modal/ContactField.php
@@ -60,8 +60,11 @@ protected function getInput()
 		// Create the modal id.
 		$modalId = 'Contact_' . $this->id;
 
+		/** @var \Joomla\CMS\WebAsset\WebAssetManager $wa */
+		$wa = Factory::getApplication()->getDocument()->getWebAssetManager();
+
 		// Add the modal field script to the document head.
-		HTMLHelper::_('script', 'system/fields/modal-fields.min.js', array('version' => 'auto', 'relative' => true));
+		$wa->useScript('field.modal-fields');
 
 		// Script to proxy the select modal function to the modal-fields.js file.
 		if ($allowSelect)
@@ -75,10 +78,12 @@ protected function getInput()
 
 			if (!isset($scriptSelect[$this->id]))
 			{
-				Factory::getDocument()->addScriptDeclaration("
-				function jSelectContact_" . $this->id . "(id, title, object) {
+				$wa->addInlineScript("
+				window.jSelectContact_" . $this->id . " = function (id, title, object) {
 					window.processModalSelect('Contact', '" . $this->id . "', id, title, '', object);
-				}"
+				}",
+					[],
+					['type' => 'module']
 				);
 
 				Text::script('JGLOBAL_ASSOCIATIONS_PROPAGATE_FAILED');

diff --git a/administrator/components/com_menus/src/Field/Modal/MenuField.php b/administrator/components/com_menus/src/Field/Modal/MenuField.php
@@ -180,8 +180,11 @@ protected function getInput()
 		// Create the modal id.
 		$modalId = 'Item_' . $this->id;
 
+		/** @var \Joomla\CMS\WebAsset\WebAssetManager $wa */
+		$wa = Factory::getApplication()->getDocument()->getWebAssetManager();
+
 		// Add the modal field script to the document head.
-		HTMLHelper::_('script', 'system/fields/modal-fields.min.js', array('version' => 'auto', 'relative' => true));
+		$wa->useScript('field.modal-fields');
 
 		// Script to proxy the select modal function to the modal-fields.js file.
 		if ($this->allowSelect)
@@ -195,11 +198,12 @@ protected function getInput()
 
 			if (!isset($scriptSelect[$this->id]))
 			{
-				Factory::getDocument()->addScriptDeclaration("
-				function jSelectMenu_" . $this->id . "(id, title, object) {
+				$wa->addInlineScript("
+				window.jSelectMenu_" . $this->id . " = function (id, title, object) {
 					window.processModalSelect('Item', '" . $this->id . "', id, title, '', object);
-				}
-				"
+				}",
+					[],
+					['type' => 'module']
 				);
 
 				Text::script('JGLOBAL_ASSOCIATIONS_PROPAGATE_FAILED');

diff --git a/administrator/components/com_newsfeeds/src/Field/Modal/NewsfeedField.php b/administrator/components/com_newsfeeds/src/Field/Modal/NewsfeedField.php
@@ -60,8 +60,11 @@ protected function getInput()
 		// Create the modal id.
 		$modalId = 'Newsfeed_' . $this->id;
 
+		/** @var \Joomla\CMS\WebAsset\WebAssetManager $wa */
+		$wa = Factory::getApplication()->getDocument()->getWebAssetManager();
+
 		// Add the modal field script to the document head.
-		HTMLHelper::_('script', 'system/fields/modal-fields.min.js', array('version' => 'auto', 'relative' => true));
+		$wa->useScript('field.modal-fields');
 
 		// Script to proxy the select modal function to the modal-fields.js file.
 		if ($allowSelect)
@@ -75,11 +78,12 @@ protected function getInput()
 
 			if (!isset($scriptSelect[$this->id]))
 			{
-				Factory::getDocument()->addScriptDeclaration("
-				function jSelectNewsfeed_" . $this->id . "(id, title, object) {
+				$wa->addInlineScript("
+				window.jSelectNewsfeed_" . $this->id . " = function (id, title, object) {
 					window.processModalSelect('Newsfeed', '" . $this->id . "', id, title, '', object);
-				}
-				"
+				}",
+					[],
+					['type' => 'module']
 				);
 
 				Text::script('JGLOBAL_ASSOCIATIONS_PROPAGATE_FAILED');