Core Enhancement 2 -Incorporation of Modules in the Articles-Edit-View

administrator/components/com_content/tmpl/article/edit.php

@@ -21,6 +21,30 @@
 
 /** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
 $wa = $this->document->getWebAssetManager();
+
+$wa
+	->useScript('com_content.admin-article-edit-modal');
+
+// Set up the bootstrap modal that will be used for all module editors
+echo HTMLHelper::_(
+	'bootstrap.renderModal',
+	'moduleEditModal',
+	array(
+		'title'       => Text::_('COM_MENUS_EDIT_MODULE_SETTINGS'),
+		'backdrop'    => 'static',
+		'keyboard'    => false,
+		'closeButton' => false,
+		'bodyHeight'  => '70',
+		'modalWidth'  => '80',
+		'footer'      => '<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" data-bs-target="#closeBtn">'
+				. Text::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</button>'
+				. '<button type="button" class="btn btn-primary" data-bs-dismiss="modal" data-bs-target="#saveBtn">'
+				. Text::_('JSAVE') . '</button>'
+				. '<button type="button" class="btn btn-success" data-bs-target="#applyBtn">'
+				. Text::_('JAPPLY') . '</button>',
+	)
+);
+
 $wa->getRegistry()->addExtensionRegistryFile('com_contenthistory');
 $wa->useScript('keepalive')
 	->useScript('form.validate')
@@ -155,7 +179,7 @@
 									class="btn btn-link module-edit-link"
 									title="<?php echo Text::_('COM_CONTENT_EDIT_MODULE'); ?>"
 									id="title-<?php echo $module->id; ?>"
-									data-module-id="ad">
+									data-module-id="<?php echo $module->id; ?>">
 									<?php echo Text::_('COM_CONTENT_EDIT_MODULE'); ?>
 								</button>
 							</td>

build/media_source/com_content/joomla.asset.json

@@ -5,6 +5,30 @@
   "description": "Joomla CMS",
   "license": "GPL-2.0-or-later",
   "assets": [
+    {
+      "name": "com_content.admin-article-edit-modal.es5",
+      "type": "script",
+      "uri": "com_content/admin-article-edit-modal-es5.min.js",
+      "dependencies": [
+        "core"
+      ],
+      "attributes": {
+        "nomodule": true,
+        "defer": true
+      }
+    },
+    {
+      "name": "com_content.admin-article-edit-modal",
+      "type": "script",
+      "uri": "com_content/admin-article-edit-modal.min.js",
+      "dependencies": [
+        "com_content.admin-article-edit-modal.es5"
+      ],
+      "attributes": {
+        "type": "module",
+        "defer": true
+      }
+    },
     {
       "name": "com_content.admin-article-pagebreak.es5",
       "type": "script",

build/media_source/com_content/js/admin-article-edit-modal.es6.js

@@ -0,0 +1,49 @@
+(function () {
+  'use strict';
+
+  /**
+   * @copyright  (C) 2021 Open Source Matters, Inc. <https://www.joomla.org>
+   * @license    GNU General Public License version 2 or later; see LICENSE.txt
+   */
+  Joomla = window.Joomla || {};
+
+  (function () {
+
+    var baseLink = 'index.php?option=com_modules&client_id=0&task=module.edit&tmpl=component&view=module&layout=modal&id=';
+    var linkElements = [].slice.call(document.getElementsByClassName('module-edit-link'));
+    var elements = [].slice.call(document.querySelectorAll('#moduleEditModal .modal-footer .btn'));
+
+    if (linkElements.length) {
+      linkElements.forEach(function (linkElement) {
+        linkElement.addEventListener('click', function (_ref) {
+          var target = _ref.target;
+          var link = baseLink + target.getAttribute('data-module-id');
+          var modal = document.getElementById('moduleEditModal');
+          var body = modal.querySelector('.modal-body');
+          var iFrame = document.createElement('iframe');
+          iFrame.src = link;
+          iFrame.setAttribute('class', 'class="iframe jviewport-height70"');
+          body.innerHTML = '';
+          body.appendChild(iFrame);
+          modal.open();
+        });
+      });
+    }
+
+    if (elements.length) {
+      elements.forEach(function (element) {
+        element.addEventListener('click', function (_ref2) {
+          var target = _ref2.target;
+          var dataTarget = target.getAttribute('data-bs-target');
+
+          if (dataTarget) {
+            var iframe = document.querySelector('#moduleEditModal iframe');
+            var iframeDocument = iframe.contentDocument || iframe.contentWindow.document;
+            iframeDocument.querySelector(dataTarget).click();
+          }
+        });
+      });
+    }
+  })();
+
+}());