Merge branch '4.2-dev' into issue-cs-37910

joomla · Jun 30, 2022 · 03fe9a9 · 03fe9a9
2 parents a0054c2 + 8164331
commit 03fe9a9
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 44 deletions.
diff --git a/administrator/components/com_content/tmpl/articles/default.php b/administrator/components/com_content/tmpl/articles/default.php
@@ -57,24 +57,9 @@
 $workflow_featured = false;
 
 if ($workflow_enabled) :
-// @todo move the script to a file
-    $js = <<<JS
-(function() {
-	document.addEventListener('DOMContentLoaded', function() {
-	  var elements = [].slice.call(document.querySelectorAll('.article-status'));
-
-	  elements.forEach(function (element) {
-		element.addEventListener('click', function(event) {
-			event.stopPropagation();
-		});
-	  });
-	});
-})();
-JS;
-
     $wa->getRegistry()->addExtensionRegistryFile('com_workflow');
     $wa->useScript('com_workflow.admin-items-workflow-buttons')
-    ->addInlineScript($js, [], ['type' => 'module']);
+    ->useScript('com_content.articles-status');
 
     $workflow_state    = Factory::getApplication()->bootComponent('com_content')->isFunctionalityUsed('core.state', 'com_content.article');
     $workflow_featured = Factory::getApplication()->bootComponent('com_content')->isFunctionalityUsed('core.featured', 'com_content.article');

diff --git a/administrator/components/com_content/tmpl/featured/default.php b/administrator/components/com_content/tmpl/featured/default.php
@@ -58,24 +58,9 @@
 $workflow_featured = false;
 
 if ($workflow_enabled) :
-// @todo move the script to a file
-    $js = <<<JS
-(function() {
-	document.addEventListener('DOMContentLoaded', function() {
-	  var elements = [].slice.call(document.querySelectorAll('.article-status'));
-
-	  elements.forEach(function (element) {
-		element.addEventListener('click', function(event) {
-			event.stopPropagation();
-		});
-	  });
-	});
-})();
-JS;
-
     $wa->getRegistry()->addExtensionRegistryFile('com_workflow');
     $wa->useScript('com_workflow.admin-items-workflow-buttons')
-    ->addInlineScript($js, [], ['type' => 'module']);
+    ->useScript('com_content.articles-status');
 
     $workflow_state    = Factory::getApplication()->bootComponent('com_content')->isFunctionalityUsed('core.state', 'com_content.article');
     $workflow_featured = Factory::getApplication()->bootComponent('com_content')->isFunctionalityUsed('core.featured', 'com_content.article');

diff --git a/administrator/components/com_installer/forms/filter_manage.xml b/administrator/components/com_installer/forms/filter_manage.xml
@@ -28,16 +28,6 @@
 			<option value="">COM_INSTALLER_VALUE_CLIENT_SELECT</option>
 		</field>
 
-		<field
-			name="package_id"
-			type="package"
-			label="COM_INSTALLER_MANAGE_FILTER_PACKAGE_ID_LABEL"
-			description="COM_INSTALLER_MANAGE_FILTER_PACKAGE_ID_DESC"
-			onchange="this.form.submit();"
-			>
-			<option value="">COM_INSTALLER_VALUE_PACKAGE_ID_SELECT</option>
-		</field>
-
 		<field
 			name="type"
 			type="type"
@@ -56,6 +46,16 @@
 			<option value="">COM_INSTALLER_VALUE_FOLDER_SELECT</option>
 		</field>
 
+		<field
+			name="package_id"
+			type="package"
+			label="COM_INSTALLER_MANAGE_FILTER_PACKAGE_ID_LABEL"
+			description="COM_INSTALLER_MANAGE_FILTER_PACKAGE_ID_DESC"
+			onchange="this.form.submit();"
+			>
+			<option value="">COM_INSTALLER_VALUE_PACKAGE_ID_SELECT</option>
+		</field>
+
 		<field
 			name="core"
 			type="list"

diff --git a/administrator/language/en-GB/plg_system_shortcut.ini b/administrator/language/en-GB/plg_system_shortcut.ini
@@ -9,4 +9,4 @@ PLG_SYSTEM_SHORTCUT_OVERVIEW_HINT="<span class=\"icon-keyboard fa-keyboard me-2\
 PLG_SYSTEM_SHORTCUT_OVERVIEW_TITLE="Joomla Keyboard Shortcuts"
 PLG_SYSTEM_SHORTCUT_TIMEOUT_DESC="Maximum time that a shortcut can be pressed after pressing <kbd>J</kbd>."
 PLG_SYSTEM_SHORTCUT_TIMEOUT_LABEL="Timeout (in milliseconds)"
-PLG_SYSTEM_SHORTCUT_XML_DESCRIPTION="<p>Enables keyboard shortcuts on the administrator site, which can be provided by other plugins and includes directly the following list of shortcuts:</p><ul class=\"list-unstyled\"><li><kbd>J</kbd> <kbd>A</kbd> Save</li><li><kbd>J</kbd> <kbd>S</kbd> Save & Close</li><li><kbd>J</kbd> <kbd>Q</kbd> Cancel</li><li><kbd>J</kbd> <kbd>N</kbd> New</li><li><kbd>J</kbd> <kbd>F</kbd> Search</li><li><kbd>J</kbd> <kbd>O</kbd> Options</li><li><kbd>J</kbd> <kbd>H</kbd> Help</li><li><kbd>J</kbd> <kbd>X</kbd> Overview</li><li><kbd>J</kbd> <kbd>D</kbd> Home Dashboard</li></ul>"
+PLG_SYSTEM_SHORTCUT_XML_DESCRIPTION="<p>Enables keyboard shortcuts on the administrator site, which can be provided by other plugins and includes directly the following list of shortcuts:</p><ul class=\"list-unstyled\"><li><kbd>J</kbd> <kbd>A</kbd> Save</li><li><kbd>J</kbd> <kbd>S</kbd> Save & Close</li><li><kbd>J</kbd> <kbd>Q</kbd> Cancel</li><li><kbd>J</kbd> <kbd>N</kbd> New</li><li><kbd>J</kbd> <kbd>F</kbd> Search</li><li><kbd>J</kbd> <kbd>O</kbd> Options</li><li><kbd>J</kbd> <kbd>H</kbd> Help</li><li><kbd>J</kbd> <kbd>M</kbd> Toggle Menu</li><li><kbd>J</kbd> <kbd>X</kbd> Overview</li><li><kbd>J</kbd> <kbd>D</kbd> Home Dashboard</li></ul>"
diff --git a/administrator/language/en-GB/plg_system_shortcut.sys.ini b/administrator/language/en-GB/plg_system_shortcut.sys.ini
@@ -4,4 +4,4 @@
 ; Note : All ini files need to be saved as UTF-8
 
 PLG_SYSTEM_SHORTCUT="System - Keyboard Shortcuts"
-PLG_SYSTEM_SHORTCUT_XML_DESCRIPTION="<p>Enables keyboard shortcuts on the administrator site, which can be provided by other plugins and includes directly the following list of shortcuts:</p><ul class=\"list-unstyled\"><li><kbd>J</kbd> <kbd>A</kbd> Save</li><li><kbd>J</kbd> <kbd>S</kbd> Save & Close</li><li><kbd>J</kbd> <kbd>Q</kbd> Cancel</li><li><kbd>J</kbd> <kbd>N</kbd> New</li><li><kbd>J</kbd> <kbd>F</kbd> Search</li><li><kbd>J</kbd> <kbd>O</kbd> Options</li><li><kbd>J</kbd> <kbd>H</kbd> Help</li><li><kbd>J</kbd> <kbd>X</kbd> Overview</li><li><kbd>J</kbd> <kbd>D</kbd> Home Dashboard</li></ul>"
+PLG_SYSTEM_SHORTCUT_XML_DESCRIPTION="<p>Enables keyboard shortcuts on the administrator site, which can be provided by other plugins and includes directly the following list of shortcuts:</p><ul class=\"list-unstyled\"><li><kbd>J</kbd> <kbd>A</kbd> Save</li><li><kbd>J</kbd> <kbd>S</kbd> Save & Close</li><li><kbd>J</kbd> <kbd>Q</kbd> Cancel</li><li><kbd>J</kbd> <kbd>N</kbd> New</li><li><kbd>J</kbd> <kbd>F</kbd> Search</li><li><kbd>J</kbd> <kbd>O</kbd> Options</li><li><kbd>J</kbd> <kbd>H</kbd> Help</li><li><kbd>J</kbd> <kbd>M</kbd> Toggle Menu</li><li><kbd>J</kbd> <kbd>X</kbd> Overview</li><li><kbd>J</kbd> <kbd>D</kbd> Home Dashboard</li></ul>"
diff --git a/build/media_source/com_content/joomla.asset.json b/build/media_source/com_content/joomla.asset.json
@@ -166,6 +166,29 @@
       "attributes": {
         "type": "module"
       }
+    },
+    {
+      "name": "com_content.articles-status.es5",
+      "type": "script",
+      "uri": "com_content/articles-status-es5.min.js",
+      "dependencies": [
+        "core"
+      ],
+      "attributes": {
+        "nomodule": true,
+        "defer": true
+      }
+    },
+    {
+      "name": "com_content.articles-status",
+      "type": "script",
+      "uri": "com_content/articles-status.min.js",
+      "dependencies": [
+        "com_content.articles-status.es5"
+      ],
+      "attributes": {
+        "type": "module"
+      }
     }
   ]
 }
diff --git a/build/media_source/com_content/js/articles-status.es6.js b/build/media_source/com_content/js/articles-status.es6.js
@@ -0,0 +1,18 @@
+/**
+ * @copyright  (C) 2022 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+(function () {
+  'use strict';
+
+  document.addEventListener('DOMContentLoaded', () => {
+    const elements = [].slice.call(document.querySelectorAll('.article-status'));
+
+    elements.forEach((element) => {
+      element.addEventListener('click', (event) => {
+        event.stopPropagation();
+      });
+    });
+  });
+}());