From 11f1f5fb14ec733f2fa98e4a438628ece55a596f Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Sun, 2 Apr 2023 15:26:26 +0200 Subject: [PATCH 1/2] Finally delete deprecated javascript assets Delete the js files and the asset once deleted with PR's #38823 and #39374 and then added back with PR #39431 for b/c reasons. --- .../com_templates/joomla.asset.json | 24 ------- .../js/admin-template-compare.es6.js | 63 ------------------- .../com_users/js/admin-users-mail.es6.js | 36 ----------- 3 files changed, 123 deletions(-) delete mode 100644 build/media_source/com_templates/js/admin-template-compare.es6.js delete mode 100644 build/media_source/com_users/js/admin-users-mail.es6.js diff --git a/build/media_source/com_templates/joomla.asset.json b/build/media_source/com_templates/joomla.asset.json index 3e663870697d0..3bba1c93d46f2 100644 --- a/build/media_source/com_templates/joomla.asset.json +++ b/build/media_source/com_templates/joomla.asset.json @@ -5,30 +5,6 @@ "description": "Joomla CMS", "license": "GPL-2.0-or-later", "assets": [ - { - "name": "com_templates.admin-template-compare.es5", - "type": "script", - "uri": "com_templates/admin-template-compare-es5.min.js", - "dependencies": [ - "core", - "diff" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_templates.admin-template-compare", - "type": "script", - "uri": "com_templates/admin-template-compare.min.js", - "dependencies": [ - "com_templates.admin-template-compare.es5" - ], - "attributes": { - "type": "module" - } - }, { "name": "com_templates.admin-template-toggle-assignment.es5", "type": "script", diff --git a/build/media_source/com_templates/js/admin-template-compare.es6.js b/build/media_source/com_templates/js/admin-template-compare.es6.js deleted file mode 100644 index 8a1c3db0a2339..0000000000000 --- a/build/media_source/com_templates/js/admin-template-compare.es6.js +++ /dev/null @@ -1,63 +0,0 @@ -/** - * @copyright (C) 2018 Open Source Matters, Inc. - * @license GNU General Public License version 2 or later; see LICENSE.txt - * - * @deprecated This file is deprecated and will be removed with Joomla 5.0 - */ -(() => { - 'use strict'; - - document.addEventListener('DOMContentLoaded', () => { - const decodeHtmlspecialChars = (text) => { - const map = { - '&': '&', - '&': '&', - '<': '<', - '>': '>', - '"': '"', - ''': "'", - '’': '’', - '‘': '‘', - '–': '–', - '—': '—', - '…': '…', - '”': '”', - }; - - /* eslint-disable */ - return text.replace(/\&[\w\d\#]{2,5}\;/g, (m) => { const n = map[m]; return n; }); - }; - - const compare = (original, changed) => { - const display = changed.nextElementSibling; - let color = ''; - let pre = null; - const diff = Diff.diffLines(original.innerHTML, changed.innerHTML); - const fragment = document.createDocumentFragment(); - - /* eslint-enable */ - - diff.forEach((part) => { - if (part.added) { - color = '#a6f3a6'; - } else if (part.removed) { - color = '#f8cbcb'; - } else { - color = ''; - } - pre = document.createElement('pre'); - pre.style.backgroundColor = color; - pre.className = 'diffview'; - pre.appendChild(document.createTextNode(decodeHtmlspecialChars(part.value))); - fragment.appendChild(pre); - }); - - display.appendChild(fragment); - }; - - const diffs = [].slice.call(document.querySelectorAll('#original')); - for (let i = 0, l = diffs.length; i < l; i += 1) { - compare(diffs[i], diffs[i].nextElementSibling); - } - }); -})(); diff --git a/build/media_source/com_users/js/admin-users-mail.es6.js b/build/media_source/com_users/js/admin-users-mail.es6.js deleted file mode 100644 index ac12fcee51984..0000000000000 --- a/build/media_source/com_users/js/admin-users-mail.es6.js +++ /dev/null @@ -1,36 +0,0 @@ -/** - * @copyright (C) 2018 Open Source Matters, Inc. - * @license GNU General Public License version 2 or later; see LICENSE.txt - * - * @deprecated This file is deprecated and will be removed with Joomla 5.0 - */ - -(() => { - 'use strict'; - - document.addEventListener('DOMContentLoaded', () => { - Joomla.submitbutton = (pressbutton) => { - const form = document.adminForm; - const html = document.createElement('joomla-alert'); - - if (pressbutton === 'mail.cancel') { - Joomla.submitform(pressbutton); - return; - } - - // do field validation - if (form.jform_subject.value === '') { - html.innerText = Joomla.Text._('COM_USERS_MAIL_PLEASE_FILL_IN_THE_SUBJECT'); - form.insertAdjacentElement('afterbegin', html); - } else if (form.jform_group.value < 0) { - html.innerText = Joomla.Text._('COM_USERS_MAIL_PLEASE_SELECT_A_GROUP'); - form.insertAdjacentElement('afterbegin', html); - } else if (form.jform_message.value === '') { - html.innerText = Joomla.Text._('COM_USERS_MAIL_PLEASE_FILL_IN_THE_MESSAGE'); - form.insertAdjacentElement('afterbegin', html); - } else { - Joomla.submitform(pressbutton); - } - }; - }); -})(); From 94988995916af421af418adbebffa61972c18088 Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Sun, 2 Apr 2023 15:51:38 +0200 Subject: [PATCH 2/2] Add the deleted files to script.php --- administrator/components/com_admin/script.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php index eaeb5883274a0..5800ad46c049c 100644 --- a/administrator/components/com_admin/script.php +++ b/administrator/components/com_admin/script.php @@ -603,6 +603,18 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false) '/libraries/vendor/web-auth/metadata-service/src/Version.php', '/libraries/vendor/web-auth/webauthn-lib/src/Server.php', '/libraries/vendor/web-token/jwt-signature-algorithm-rsa/RSA.php', + '/media/com_templates/js/admin-template-compare-es5.js', + '/media/com_templates/js/admin-template-compare-es5.min.js', + '/media/com_templates/js/admin-template-compare-es5.min.js.gz', + '/media/com_templates/js/admin-template-compare.js', + '/media/com_templates/js/admin-template-compare.min.js', + '/media/com_templates/js/admin-template-compare.min.js.gz', + '/media/com_users/js/admin-users-mail-es5.js', + '/media/com_users/js/admin-users-mail-es5.min.js', + '/media/com_users/js/admin-users-mail-es5.min.js.gz', + '/media/com_users/js/admin-users-mail.js', + '/media/com_users/js/admin-users-mail.min.js', + '/media/com_users/js/admin-users-mail.min.js.gz', '/media/vendor/tinymce/plugins/bbcode/index.js', '/media/vendor/tinymce/plugins/bbcode/plugin.js', '/media/vendor/tinymce/plugins/bbcode/plugin.min.js',