From d5fbef90327395612549b3a21f57d8c63bd91821 Mon Sep 17 00:00:00 2001 From: fortunato Date: Fri, 10 Jan 2025 12:46:49 -0700 Subject: [PATCH 1/3] fix: LPD-45795 Check element exists --- ...-Drag-Image-from-top-content-line-in.patch | 2 +- ...n-popups-not-appears-correctly-in-ma.patch | 2 +- ...326-Remove-check-for-Webkit-browsers.patch | 2 +- ...-obsolete-summary-field-from-table-e.patch | 2 +- ...d-additional-resource-URL-parameters.patch | 2 +- ...-pass-languageId-to-css-files-reques.patch | 2 +- .../0007-LPS-124728-Avoid-breaking-IE11.patch | 2 +- ...idth-for-the-following-fields-Cell-s.patch | 2 +- patches/0009-LPS-131699-Add-null-check.patch | 2 +- ...d-on-first-render-instead-of-changin.patch | 2 +- ...998-Avoid-breaking-the-UI-in-firefox.patch | 2 +- ...37425-Don-t-check-selection-on-focus.patch | 2 +- ...upgrading-from-6.2-to-7.1-image-widt.patch | 2 +- ...ntentsElement-is-defined-use-it-as-a.patch | 2 +- ...dialog-close-button-accessible-with-.patch | 2 +- ...te-id-and-name-fields-according-to-s.patch | 2 +- ...ways-set-some-width-to-img-container.patch | 2 +- ...Add-css-to-combopanel-when-maximized.patch | 2 +- .../0019-LPD-35604-Add-title-to-iframe.patch | 2 +- ...width-based-on-px-so-it-does-not-aff.patch | 2 +- ...d-of-setting-a-width-from-image2-plu.patch | 2 +- .../0022-LPD-45795-Check-element-exists.patch | 22 +++++++++++++++++++ 22 files changed, 43 insertions(+), 21 deletions(-) create mode 100644 patches/0022-LPD-45795-Check-element-exists.patch diff --git a/patches/0001-LPS-89596-Cannot-Drag-Image-from-top-content-line-in.patch b/patches/0001-LPS-89596-Cannot-Drag-Image-from-top-content-line-in.patch index 232eb4241..9aaebc588 100644 --- a/patches/0001-LPS-89596-Cannot-Drag-Image-from-top-content-line-in.patch +++ b/patches/0001-LPS-89596-Cannot-Drag-Image-from-top-content-line-in.patch @@ -1,4 +1,4 @@ -From 60d7bb0ead21b1e144d656de6d0ba7327d8635c9 Mon Sep 17 00:00:00 2001 +From 32f04d3b71dac81f0dcdfb765051b7f79d2560fe Mon Sep 17 00:00:00 2001 From: Julien Castelain Date: Tue, 14 May 2019 10:47:25 +0200 Subject: [PATCH] LPS-89596 Cannot Drag Image from top content line in IE11 diff --git a/patches/0002-LPS-95472-Tabs-in-popups-not-appears-correctly-in-ma.patch b/patches/0002-LPS-95472-Tabs-in-popups-not-appears-correctly-in-ma.patch index 5a363f599..41de30579 100644 --- a/patches/0002-LPS-95472-Tabs-in-popups-not-appears-correctly-in-ma.patch +++ b/patches/0002-LPS-95472-Tabs-in-popups-not-appears-correctly-in-ma.patch @@ -1,4 +1,4 @@ -From 9ef832932ffdd9fbf1084216016f3d298a6b33c4 Mon Sep 17 00:00:00 2001 +From 5f8036acf407ecbb4ad66df1940a6311384ce85b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20P=C3=A1kai?= Date: Tue, 21 May 2019 09:38:15 +0200 Subject: [PATCH] LPS-95472 Tabs in popups not appears correctly in maximized diff --git a/patches/0003-LPS-85326-Remove-check-for-Webkit-browsers.patch b/patches/0003-LPS-85326-Remove-check-for-Webkit-browsers.patch index f3b21e6cf..65254bf3c 100644 --- a/patches/0003-LPS-85326-Remove-check-for-Webkit-browsers.patch +++ b/patches/0003-LPS-85326-Remove-check-for-Webkit-browsers.patch @@ -1,4 +1,4 @@ -From 1f982c9eaef3d6d3ccad786d7a6389f00fab5989 Mon Sep 17 00:00:00 2001 +From 50230f55c71bd8dfb86ab4d502c4441fbb35e527 Mon Sep 17 00:00:00 2001 From: Julien Castelain Date: Wed, 25 Mar 2020 12:58:15 +0100 Subject: [PATCH] LPS-85326 Remove check for Webkit browsers diff --git a/patches/0004-LPP-36989-Remove-obsolete-summary-field-from-table-e.patch b/patches/0004-LPP-36989-Remove-obsolete-summary-field-from-table-e.patch index db0d9f073..0c40fd8be 100644 --- a/patches/0004-LPP-36989-Remove-obsolete-summary-field-from-table-e.patch +++ b/patches/0004-LPP-36989-Remove-obsolete-summary-field-from-table-e.patch @@ -1,4 +1,4 @@ -From fbe13a11e6a4249e7a82fa0e37df0a4be337a556 Mon Sep 17 00:00:00 2001 +From db56145394c65e725428f65c0e48f4dbca4e3f4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20P=C3=A1kai?= Date: Tue, 14 Apr 2020 10:15:56 +0200 Subject: [PATCH] LPP-36989 Remove obsolete summary field from table elements diff --git a/patches/0005-LPS-112982-Add-additional-resource-URL-parameters.patch b/patches/0005-LPS-112982-Add-additional-resource-URL-parameters.patch index 925a3048a..a557786c5 100644 --- a/patches/0005-LPS-112982-Add-additional-resource-URL-parameters.patch +++ b/patches/0005-LPS-112982-Add-additional-resource-URL-parameters.patch @@ -1,4 +1,4 @@ -From c9d7599ed0682c47bf96119e12df2a6e0d885fa3 Mon Sep 17 00:00:00 2001 +From 5591c2e52325de6d43f8de103e6411a70a794046 Mon Sep 17 00:00:00 2001 From: Julien Castelain Date: Tue, 7 Jul 2020 09:47:27 +0200 Subject: [PATCH] LPS-112982 Add additional resource URL parameters diff --git a/patches/0006-LPS-118624-Don-t-pass-languageId-to-css-files-reques.patch b/patches/0006-LPS-118624-Don-t-pass-languageId-to-css-files-reques.patch index 2f0974651..0fb20278b 100644 --- a/patches/0006-LPS-118624-Don-t-pass-languageId-to-css-files-reques.patch +++ b/patches/0006-LPS-118624-Don-t-pass-languageId-to-css-files-reques.patch @@ -1,4 +1,4 @@ -From 4a0df688f5c580d131ff98c796b71c2a0cd27112 Mon Sep 17 00:00:00 2001 +From 681a7e450532f21e5339d31454879f17d593b83e Mon Sep 17 00:00:00 2001 From: Carlos Lancha Date: Thu, 6 Aug 2020 14:42:21 +0200 Subject: [PATCH] LPS-118624 Don't pass languageId to css files requests diff --git a/patches/0007-LPS-124728-Avoid-breaking-IE11.patch b/patches/0007-LPS-124728-Avoid-breaking-IE11.patch index 4342e13ea..14ddd44ef 100644 --- a/patches/0007-LPS-124728-Avoid-breaking-IE11.patch +++ b/patches/0007-LPS-124728-Avoid-breaking-IE11.patch @@ -1,4 +1,4 @@ -From a172e2c30c9153e54dc1c0a641b221087a7f445f Mon Sep 17 00:00:00 2001 +From d40e6e561ab999d113460657fbe6089b5596112c Mon Sep 17 00:00:00 2001 From: Julien Castelain Date: Mon, 21 Dec 2020 09:12:53 +0100 Subject: [PATCH] LPS-124728 Avoid breaking IE11 diff --git a/patches/0008-LPS-125559-Fix-width-for-the-following-fields-Cell-s.patch b/patches/0008-LPS-125559-Fix-width-for-the-following-fields-Cell-s.patch index 22bb3ed8c..7bc34b201 100644 --- a/patches/0008-LPS-125559-Fix-width-for-the-following-fields-Cell-s.patch +++ b/patches/0008-LPS-125559-Fix-width-for-the-following-fields-Cell-s.patch @@ -1,4 +1,4 @@ -From eacf555871dfc4b72a2ac80354e8aab35aab4ec4 Mon Sep 17 00:00:00 2001 +From 7f764bc0581533bf6425d69c506028905f28787e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20P=C3=A1kai?= Date: Fri, 8 Jan 2021 10:58:23 +0100 Subject: [PATCH] LPS-125559 Fix width for the following fields Cell spacing, diff --git a/patches/0009-LPS-131699-Add-null-check.patch b/patches/0009-LPS-131699-Add-null-check.patch index 242ef6bd6..c0de47b2c 100644 --- a/patches/0009-LPS-131699-Add-null-check.patch +++ b/patches/0009-LPS-131699-Add-null-check.patch @@ -1,4 +1,4 @@ -From 199b36f0bc74b4a12c4cd04720fe73761ace45eb Mon Sep 17 00:00:00 2001 +From 10bfac0e5b2c31085db1a21240c7d6bc3d081771 Mon Sep 17 00:00:00 2001 From: IstvanD Date: Wed, 19 May 2021 17:43:17 +0200 Subject: [PATCH] LPS-131699 Add null check diff --git a/patches/0010-LPS-136119-Set-id-on-first-render-instead-of-changin.patch b/patches/0010-LPS-136119-Set-id-on-first-render-instead-of-changin.patch index f7a573cde..fb56723ff 100644 --- a/patches/0010-LPS-136119-Set-id-on-first-render-instead-of-changin.patch +++ b/patches/0010-LPS-136119-Set-id-on-first-render-instead-of-changin.patch @@ -1,4 +1,4 @@ -From 8ab97db622d1981168c19b58b7f43e2d2ef40749 Mon Sep 17 00:00:00 2001 +From 2debdd3b773334bd32d018318689ecdb9c1e76f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20=C4=8Ciko=C5=A1?= Date: Mon, 9 Aug 2021 18:04:44 +0200 Subject: [PATCH] LPS-136119 Set `id` on first render, instead of changing it diff --git a/patches/0011-LPS-136998-Avoid-breaking-the-UI-in-firefox.patch b/patches/0011-LPS-136998-Avoid-breaking-the-UI-in-firefox.patch index af6277a37..27b6b5083 100644 --- a/patches/0011-LPS-136998-Avoid-breaking-the-UI-in-firefox.patch +++ b/patches/0011-LPS-136998-Avoid-breaking-the-UI-in-firefox.patch @@ -1,4 +1,4 @@ -From 40f5305991a7a81252996c2780cc336ce1b3182e Mon Sep 17 00:00:00 2001 +From 1999ff9ccb18d2b5c5a811478778900043078e59 Mon Sep 17 00:00:00 2001 From: Norbert Nemeth Date: Tue, 17 Aug 2021 11:20:58 +0200 Subject: [PATCH] LPS-136998 Avoid breaking the UI in firefox diff --git a/patches/0012-LPS-137425-Don-t-check-selection-on-focus.patch b/patches/0012-LPS-137425-Don-t-check-selection-on-focus.patch index e869cb1f7..0e3c1829d 100644 --- a/patches/0012-LPS-137425-Don-t-check-selection-on-focus.patch +++ b/patches/0012-LPS-137425-Don-t-check-selection-on-focus.patch @@ -1,4 +1,4 @@ -From ef9b7b984a8344e98f97f0ec4ce91a7654d32bf4 Mon Sep 17 00:00:00 2001 +From f3f3c468f9a18996f03f3933cddb847608a83d44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20=C4=8Ciko=C5=A1?= Date: Mon, 16 Aug 2021 18:36:20 +0200 Subject: [PATCH] LPS-137425 Don't check selection on focus diff --git a/patches/0013-LPS-139565-When-upgrading-from-6.2-to-7.1-image-widt.patch b/patches/0013-LPS-139565-When-upgrading-from-6.2-to-7.1-image-widt.patch index 090c98111..f9990de7c 100644 --- a/patches/0013-LPS-139565-When-upgrading-from-6.2-to-7.1-image-widt.patch +++ b/patches/0013-LPS-139565-When-upgrading-from-6.2-to-7.1-image-widt.patch @@ -1,4 +1,4 @@ -From 52cdbe87dc2c830050995782029c00d98476f0e8 Mon Sep 17 00:00:00 2001 +From ca67ee4ef6a39cde607ba1f8ee0bae10f02c62fc Mon Sep 17 00:00:00 2001 From: Minhchau Date: Tue, 28 Sep 2021 11:18:40 -0700 Subject: [PATCH] LPS-139565 When upgrading from 6.2 to 7.1, image width/height diff --git a/patches/0014-LPS-137763-If-contentsElement-is-defined-use-it-as-a.patch b/patches/0014-LPS-137763-If-contentsElement-is-defined-use-it-as-a.patch index 5b4651634..052dc2c2c 100644 --- a/patches/0014-LPS-137763-If-contentsElement-is-defined-use-it-as-a.patch +++ b/patches/0014-LPS-137763-If-contentsElement-is-defined-use-it-as-a.patch @@ -1,4 +1,4 @@ -From 285d98de85262c97990861c7fa2912c79d629dab Mon Sep 17 00:00:00 2001 +From 7cab90825643aa5cc612e90edbf762c5f1ef3d52 Mon Sep 17 00:00:00 2001 From: Diego Nascimento Date: Mon, 18 Oct 2021 17:45:43 -0300 Subject: [PATCH] LPS-137763 If contentsElement is defined, use it as a diff --git a/patches/0015-LPS-166086-Make-dialog-close-button-accessible-with-.patch b/patches/0015-LPS-166086-Make-dialog-close-button-accessible-with-.patch index e9003ac2f..ea76ea9a6 100644 --- a/patches/0015-LPS-166086-Make-dialog-close-button-accessible-with-.patch +++ b/patches/0015-LPS-166086-Make-dialog-close-button-accessible-with-.patch @@ -1,4 +1,4 @@ -From 43bcaf0df50ee514659c936b96efa1b6d1c0647b Mon Sep 17 00:00:00 2001 +From 1d81575e3ab3a115d99d932ec65d748dbed35137 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20=C4=8Ciko=C5=A1?= Date: Fri, 21 Oct 2022 15:28:58 +0200 Subject: [PATCH] LPS-166086 Make dialog close button accessible with keyboard diff --git a/patches/0016-LPD-19992-Validate-id-and-name-fields-according-to-s.patch b/patches/0016-LPD-19992-Validate-id-and-name-fields-according-to-s.patch index 891fa7a42..fc1d88a92 100644 --- a/patches/0016-LPD-19992-Validate-id-and-name-fields-according-to-s.patch +++ b/patches/0016-LPD-19992-Validate-id-and-name-fields-according-to-s.patch @@ -1,4 +1,4 @@ -From 3178a4f9b25b333bf406f1b8bb049d9bf3379af9 Mon Sep 17 00:00:00 2001 +From 6686b94ab3b7201221814ab51f6980062c51864b Mon Sep 17 00:00:00 2001 From: Antonio Ortega <60252917@liferay.com> Date: Fri, 15 Mar 2024 16:01:20 +0100 Subject: [PATCH] LPD-19992 Validate id and name fields according to spec diff --git a/patches/0017-LPD-20726-Always-set-some-width-to-img-container.patch b/patches/0017-LPD-20726-Always-set-some-width-to-img-container.patch index 198912e0e..b11467c9f 100644 --- a/patches/0017-LPD-20726-Always-set-some-width-to-img-container.patch +++ b/patches/0017-LPD-20726-Always-set-some-width-to-img-container.patch @@ -1,4 +1,4 @@ -From 92bf4c27c47d5471c0927f373a21f776d476e3ae Mon Sep 17 00:00:00 2001 +From 9bc198cc1b354228e9c6168dc62a3e876fa27d2b Mon Sep 17 00:00:00 2001 From: Antonio Ortega <60252917@liferay.com> Date: Mon, 18 Mar 2024 15:20:47 +0100 Subject: [PATCH] LPD-20726 Always set some width to img container diff --git a/patches/0018-LPD-33712-Add-css-to-combopanel-when-maximized.patch b/patches/0018-LPD-33712-Add-css-to-combopanel-when-maximized.patch index 242222a70..d5b9960b4 100644 --- a/patches/0018-LPD-33712-Add-css-to-combopanel-when-maximized.patch +++ b/patches/0018-LPD-33712-Add-css-to-combopanel-when-maximized.patch @@ -1,4 +1,4 @@ -From bb2809b07fb4457dc6e381671849e3a4ba704051 Mon Sep 17 00:00:00 2001 +From 55f70f7535185865643def858cedf34c668ce3ec Mon Sep 17 00:00:00 2001 From: Fortunato Date: Thu, 22 Aug 2024 11:20:50 -0600 Subject: [PATCH] LPD-33712 Add css to combopanel when maximized diff --git a/patches/0019-LPD-35604-Add-title-to-iframe.patch b/patches/0019-LPD-35604-Add-title-to-iframe.patch index a727ddbfe..9c7ad4eec 100644 --- a/patches/0019-LPD-35604-Add-title-to-iframe.patch +++ b/patches/0019-LPD-35604-Add-title-to-iframe.patch @@ -1,4 +1,4 @@ -From 676e9353d1cba12dfc2603efe446bdf7015bb5d4 Mon Sep 17 00:00:00 2001 +From 7bcbc7278a9c6293822f3c5234c1b06297e7e179 Mon Sep 17 00:00:00 2001 From: Fortunato Maldonado Date: Thu, 5 Sep 2024 11:28:29 -0600 Subject: [PATCH] LPD-35604 Add title to iframe diff --git a/patches/0020-LPD-42473-Set-a-width-based-on-px-so-it-does-not-aff.patch b/patches/0020-LPD-42473-Set-a-width-based-on-px-so-it-does-not-aff.patch index 89c82c1ef..4c597f4f3 100644 --- a/patches/0020-LPD-42473-Set-a-width-based-on-px-so-it-does-not-aff.patch +++ b/patches/0020-LPD-42473-Set-a-width-based-on-px-so-it-does-not-aff.patch @@ -1,4 +1,4 @@ -From 06a709363009811b5261aea29a564cd6814d628d Mon Sep 17 00:00:00 2001 +From ca360a67d9eec1844b9d67851bb78e23c586831f Mon Sep 17 00:00:00 2001 From: Antonio Ortega <60252917@liferay.com> Date: Wed, 20 Nov 2024 13:35:16 +0100 Subject: [PATCH] LPD-42473 Set a width based on px so it does not affect image diff --git a/patches/0021-LPD-42473-Instead-of-setting-a-width-from-image2-plu.patch b/patches/0021-LPD-42473-Instead-of-setting-a-width-from-image2-plu.patch index 22618903b..d6a6933bf 100644 --- a/patches/0021-LPD-42473-Instead-of-setting-a-width-from-image2-plu.patch +++ b/patches/0021-LPD-42473-Instead-of-setting-a-width-from-image2-plu.patch @@ -1,4 +1,4 @@ -From a22487af646380ae9fb6a1a87db8afd967e4e792 Mon Sep 17 00:00:00 2001 +From 05cff8c9f345d667c8082c58bb41af2966ece34d Mon Sep 17 00:00:00 2001 From: Antonio Ortega <60252917@liferay.com> Date: Wed, 4 Dec 2024 14:09:03 +0100 Subject: [PATCH] LPD-42473 Instead of setting a width from image2 plugin, diff --git a/patches/0022-LPD-45795-Check-element-exists.patch b/patches/0022-LPD-45795-Check-element-exists.patch new file mode 100644 index 000000000..7f6855878 --- /dev/null +++ b/patches/0022-LPD-45795-Check-element-exists.patch @@ -0,0 +1,22 @@ +From dbc711caec014f00f945818d630e49db802824a8 Mon Sep 17 00:00:00 2001 +From: fortunato +Date: Fri, 10 Jan 2025 12:22:30 -0700 +Subject: [PATCH] LPD-45795 Check element exists + +--- + plugins/widget/plugin.js | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/plugins/widget/plugin.js b/plugins/widget/plugin.js +index d462cfcdb0..16b71500dc 100644 +--- a/plugins/widget/plugin.js ++++ b/plugins/widget/plugin.js +@@ -522,7 +522,7 @@ + * a given element. + */ + initOn: function( element, widgetDef, startupData ) { +- if ( !widgetDef ) ++ if ( !widgetDef && element ) + widgetDef = this.registered[ element.data( 'widget' ) ]; + else if ( typeof widgetDef == 'string' ) + widgetDef = this.registered[ widgetDef ]; From 01e12a5c4f1e2f0737fe901d5140214eb4e9de12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20=C4=8Ciko=C5=A1?= Date: Mon, 13 Jan 2025 11:24:38 +0100 Subject: [PATCH 2/3] chore: Don't run build on CI, as it breaks on JDK 17 --- .github/workflows/ci.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 665722e8e..6d692254b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,6 +25,3 @@ jobs: node-version: ${{ matrix.node-version }} - run: yarn --frozen-lockfile - run: yarn ci - - run: ./ck.sh build - env: - CI: true From fdb75ec8667e498f2278381955aa0f0f7638da74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20=C4=8Ciko=C5=A1?= Date: Mon, 13 Jan 2025 12:09:59 +0100 Subject: [PATCH 3/3] docs: Add warning for build Java version --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index ca3e28a31..379e45d07 100644 --- a/README.md +++ b/README.md @@ -78,6 +78,8 @@ These are the steps you would follow, for example, to apply a workaround for a b ./ck.sh build ``` + Make sure your Java version is 15 or lower. Builder will crash if the version is higher. + If you'd rather like a development build, for example for local debugging, use: ```sh