Skip to content

Commit

Permalink
chore: update patches
Browse files Browse the repository at this point in the history
  • Loading branch information
fortunatomaldonado committed May 7, 2024
1 parent ac44688 commit 063d723
Show file tree
Hide file tree
Showing 18 changed files with 38 additions and 38 deletions.
2 changes: 1 addition & 1 deletion ckeditor-dev
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From fc4aab05fb04539c2c288ae930a5a39b33eff5a2 Mon Sep 17 00:00:00 2001
From 6cb5b433b216e01c5a84f3514563ca52717ffe32 Mon Sep 17 00:00:00 2001
From: Julien Castelain <[email protected]>
Date: Tue, 14 May 2019 10:47:25 +0200
Subject: [PATCH] LPS-89596 Cannot Drag Image from top content line in IE11
Expand All @@ -10,7 +10,7 @@ Changed position of drag icon for IE.
1 file changed, 4 insertions(+)

diff --git a/plugins/widget/plugin.js b/plugins/widget/plugin.js
index 54770a7dac..d462cfcdb0 100644
index e6f3c20a41..db30d17f1d 100644
--- a/plugins/widget/plugin.js
+++ b/plugins/widget/plugin.js
@@ -1607,6 +1607,10 @@
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 8dbf9f02c14c92f99b2f40192e2bf5f56f24f0cf Mon Sep 17 00:00:00 2001
From ba7d8e1520696fea5baad02dcacc0a11fc17437b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20P=C3=A1kai?= <[email protected]>
Date: Tue, 21 May 2019 09:38:15 +0200
Subject: [PATCH] LPS-95472 Tabs in popups not appears correctly in maximized
Expand All @@ -11,7 +11,7 @@ plugin.
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/dialog/plugin.js b/plugins/dialog/plugin.js
index b6a5077918..5101c888ff 100644
index cd4a542c57..12b89ea4d3 100644
--- a/plugins/dialog/plugin.js
+++ b/plugins/dialog/plugin.js
@@ -1188,7 +1188,7 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
Expand Down
4 changes: 2 additions & 2 deletions patches/0003-LPS-85326-Remove-check-for-Webkit-browsers.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 6ad86cdfcbb7be834d38acb9d39ebd1bdff28e37 Mon Sep 17 00:00:00 2001
From cd49f846dad2bec099ada85ed85fa826e3b47e1d Mon Sep 17 00:00:00 2001
From: Julien Castelain <[email protected]>
Date: Wed, 25 Mar 2020 12:58:15 +0100
Subject: [PATCH] LPS-85326 Remove check for Webkit browsers
Expand All @@ -18,7 +18,7 @@ https://github.com/liferay/liferay-ckeditor/commit/328017c65063ac18119e244fec92d
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/selection.js b/core/selection.js
index 48d5732f76..854796a3bd 100644
index 9ad15bb882..141b5859f0 100644
--- a/core/selection.js
+++ b/core/selection.js
@@ -2280,7 +2280,7 @@
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 0d96f16b21036609efbc134ce2c63fbed82e1a8c Mon Sep 17 00:00:00 2001
From 9aba69d943a328933c8a7970a61b473cacb95b46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20P=C3=A1kai?= <[email protected]>
Date: Tue, 14 Apr 2020 10:15:56 +0200
Subject: [PATCH] LPP-36989 Remove obsolete summary field from table elements
Expand All @@ -15,7 +15,7 @@ Subject: [PATCH] LPP-36989 Remove obsolete summary field from table elements
8 files changed, 38 insertions(+), 56 deletions(-)

diff --git a/plugins/table/dialogs/table.js b/plugins/table/dialogs/table.js
index acc0210f6d..64101f74f2 100755
index 7106417dde..f5f46c952c 100755
--- a/plugins/table/dialogs/table.js
+++ b/plugins/table/dialogs/table.js
@@ -538,22 +538,6 @@
Expand All @@ -42,7 +42,7 @@ index acc0210f6d..64101f74f2 100755
} ]
},
diff --git a/plugins/table/plugin.js b/plugins/table/plugin.js
index 69efd521a1..9d1c144648 100755
index 83ecfb9945..04305713a9 100755
--- a/plugins/table/plugin.js
+++ b/plugins/table/plugin.js
@@ -18,7 +18,7 @@ CKEDITOR.plugins.add( 'table', {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 21257438b6bb09380711834d3ddcb91cafcf89a9 Mon Sep 17 00:00:00 2001
From 89bb0448650c0da2a1251e309e9485e6dcd128cc Mon Sep 17 00:00:00 2001
From: Julien Castelain <[email protected]>
Date: Tue, 7 Jul 2020 09:47:27 +0200
Subject: [PATCH] LPS-112982 Add additional resource URL parameters
Expand All @@ -9,7 +9,7 @@ Subject: [PATCH] LPS-112982 Add additional resource URL parameters
2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/core/ckeditor_base.js b/core/ckeditor_base.js
index 3fe1158f93..b68e88d5c2 100644
index 81a33e0b1e..31c9034ece 100644
--- a/core/ckeditor_base.js
+++ b/core/ckeditor_base.js
@@ -175,13 +175,26 @@ if ( !window.CKEDITOR ) {
Expand Down Expand Up @@ -45,7 +45,7 @@ index 3fe1158f93..b68e88d5c2 100644

/**
diff --git a/core/config.js b/core/config.js
index 73db6e7e19..7660ed527f 100644
index 34cc8f1527..8d443e54d3 100644
--- a/core/config.js
+++ b/core/config.js
@@ -8,6 +8,15 @@
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 32e8fe78d794d0b01b1de4eecaa51b41cce2038a Mon Sep 17 00:00:00 2001
From 7b9fce18a0eef5a34529f6821c0cdacf8dbda608 Mon Sep 17 00:00:00 2001
From: Carlos Lancha <[email protected]>
Date: Thu, 6 Aug 2020 14:42:21 +0200
Subject: [PATCH] LPS-118624 Don't pass languageId to css files requests
Expand All @@ -8,7 +8,7 @@ Subject: [PATCH] LPS-118624 Don't pass languageId to css files requests
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/ckeditor_base.js b/core/ckeditor_base.js
index b68e88d5c2..de87cd6d52 100644
index 31c9034ece..99f34dd8aa 100644
--- a/core/ckeditor_base.js
+++ b/core/ckeditor_base.js
@@ -188,7 +188,7 @@ if ( !window.CKEDITOR ) {
Expand Down
4 changes: 2 additions & 2 deletions patches/0007-LPS-124728-Avoid-breaking-IE11.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 8f89ed6852ace5060193c2354de1063ff0718b0f Mon Sep 17 00:00:00 2001
From a270cd578a069cb5f13b94d5637dca4eb72081ef Mon Sep 17 00:00:00 2001
From: Julien Castelain <[email protected]>
Date: Mon, 21 Dec 2020 09:12:53 +0100
Subject: [PATCH] LPS-124728 Avoid breaking IE11
Expand All @@ -11,7 +11,7 @@ they aren't loaded when getUrl is executed.
1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/core/ckeditor_base.js b/core/ckeditor_base.js
index de87cd6d52..7e8120b797 100644
index 99f34dd8aa..2f6fca4f12 100644
--- a/core/ckeditor_base.js
+++ b/core/ckeditor_base.js
@@ -175,26 +175,32 @@ if ( !window.CKEDITOR ) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From bebcb56bd2fa6c6f0c8f3476205b537732373ac2 Mon Sep 17 00:00:00 2001
From f6c8b1299b0de7514210f9dbd9b8a2b1ebca1874 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20P=C3=A1kai?= <[email protected]>
Date: Fri, 8 Jan 2021 10:58:23 +0100
Subject: [PATCH] LPS-125559 Fix width for the following fields Cell spacing,
Expand All @@ -9,7 +9,7 @@ Subject: [PATCH] LPS-125559 Fix width for the following fields Cell spacing,
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/table/dialogs/table.js b/plugins/table/dialogs/table.js
index 64101f74f2..ae4a204123 100755
index f5f46c952c..7e396b0cd2 100755
--- a/plugins/table/dialogs/table.js
+++ b/plugins/table/dialogs/table.js
@@ -357,7 +357,7 @@
Expand Down
4 changes: 2 additions & 2 deletions patches/0009-LPS-131699-Add-null-check.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 22ca0d2cd1f4101c5d646b72db1abaaf1f30af50 Mon Sep 17 00:00:00 2001
From dfbeadd0b8e510106333956b1663a8ebe918aaa0 Mon Sep 17 00:00:00 2001
From: IstvanD <[email protected]>
Date: Wed, 19 May 2021 17:43:17 +0200
Subject: [PATCH] LPS-131699 Add null check
Expand All @@ -8,7 +8,7 @@ Subject: [PATCH] LPS-131699 Add null check
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/event.js b/core/event.js
index 6dc8448f62..23c4919d15 100644
index 597be4dc62..e41848c9e8 100644
--- a/core/event.js
+++ b/core/event.js
@@ -172,7 +172,9 @@
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 01268beea2e88a5a35b4f09de67297d90839161b Mon Sep 17 00:00:00 2001
From 62d54c930a8d0d10059484cd9d41bbf22127e4df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marko=20=C4=8Ciko=C5=A1?= <[email protected]>
Date: Mon, 9 Aug 2021 18:04:44 +0200
Subject: [PATCH] LPS-136119 Set `id` on first render, instead of changing it
Expand All @@ -9,7 +9,7 @@ Subject: [PATCH] LPS-136119 Set `id` on first render, instead of changing it
1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/plugins/button/plugin.js b/plugins/button/plugin.js
index 19ece8424b..002302def8 100644
index bf23be1fa0..e7f230e4ec 100644
--- a/plugins/button/plugin.js
+++ b/plugins/button/plugin.js
@@ -146,7 +146,6 @@
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From f129774cb256801e9eb437d2ae480c6899ea4819 Mon Sep 17 00:00:00 2001
From 054134b7db1d2780150bb2042f67107c24483ce0 Mon Sep 17 00:00:00 2001
From: Norbert Nemeth <[email protected]>
Date: Tue, 17 Aug 2021 11:20:58 +0200
Subject: [PATCH] LPS-136998 Avoid breaking the UI in firefox
Expand All @@ -8,7 +8,7 @@ Subject: [PATCH] LPS-136998 Avoid breaking the UI in firefox
1 file changed, 13 deletions(-)

diff --git a/plugins/maximize/plugin.js b/plugins/maximize/plugin.js
index a3625a1b31..85bc421f18 100644
index ff687e4b52..c8c929f277 100644
--- a/plugins/maximize/plugin.js
+++ b/plugins/maximize/plugin.js
@@ -72,19 +72,6 @@
Expand Down
4 changes: 2 additions & 2 deletions patches/0012-LPS-137425-Don-t-check-selection-on-focus.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 4547f1cf7a5e75715f5235cee8973790819f3c1e Mon Sep 17 00:00:00 2001
From 83ecf5620408bf392e2ba34274d440628a7553d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marko=20=C4=8Ciko=C5=A1?= <[email protected]>
Date: Mon, 16 Aug 2021 18:36:20 +0200
Subject: [PATCH] LPS-137425 Don't check selection on focus
Expand All @@ -8,7 +8,7 @@ Subject: [PATCH] LPS-137425 Don't check selection on focus
1 file changed, 9 deletions(-)

diff --git a/core/selection.js b/core/selection.js
index 854796a3bd..65b221b6fc 100644
index 141b5859f0..3ff3557207 100644
--- a/core/selection.js
+++ b/core/selection.js
@@ -977,15 +977,6 @@
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 8ea000cb5aa18ceb08f19ac955268c0452b922a8 Mon Sep 17 00:00:00 2001
From 759682df9dcb400abd339db501710e574b3295d2 Mon Sep 17 00:00:00 2001
From: Minhchau <[email protected]>
Date: Tue, 28 Sep 2021 11:18:40 -0700
Subject: [PATCH] LPS-139565 When upgrading from 6.2 to 7.1, image width/height
Expand All @@ -10,7 +10,7 @@ If inline styles for height/width are set on the image, prefer those over the na
1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/plugins/image2/plugin.js b/plugins/image2/plugin.js
index 63de6333e5..bcf986bad4 100644
index 9452107073..4460ebfd83 100644
--- a/plugins/image2/plugin.js
+++ b/plugins/image2/plugin.js
@@ -376,8 +376,8 @@
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 67d247ecc4e95b27d19565ded80a76c8f65c7642 Mon Sep 17 00:00:00 2001
From 3fd855e5d8caf5d8d8bdbcd2211a5b978269ed39 Mon Sep 17 00:00:00 2001
From: Diego Nascimento <[email protected]>
Date: Mon, 18 Oct 2021 17:45:43 -0300
Subject: [PATCH] LPS-137763 If contentsElement is defined, use it as a
Expand All @@ -10,7 +10,7 @@ Subject: [PATCH] LPS-137763 If contentsElement is defined, use it as a
2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/core/creators/themedui.js b/core/creators/themedui.js
index 7f8d56b30d..0c583a550b 100644
index d5acd17793..e27252b918 100644
--- a/core/creators/themedui.js
+++ b/core/creators/themedui.js
@@ -267,8 +267,10 @@ CKEDITOR.replaceClass = 'ckeditor';
Expand All @@ -27,7 +27,7 @@ index 7f8d56b30d..0c583a550b 100644
editor.mode = '';
} else {
diff --git a/plugins/wysiwygarea/plugin.js b/plugins/wysiwygarea/plugin.js
index 4466b281d5..bdfe2ff6fe 100644
index 8dcb82ac3f..451c765ecf 100644
--- a/plugins/wysiwygarea/plugin.js
+++ b/plugins/wysiwygarea/plugin.js
@@ -42,7 +42,7 @@
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From a63e02e7619a64f4aca4837dd93c5e2e597eeca6 Mon Sep 17 00:00:00 2001
From 3d1cd98ec49fa5a5dbe6e7891dbd6528281d8a6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marko=20=C4=8Ciko=C5=A1?= <[email protected]>
Date: Fri, 21 Oct 2022 15:28:58 +0200
Subject: [PATCH] LPS-166086 Make dialog close button accessible with keyboard
Expand All @@ -8,7 +8,7 @@ Subject: [PATCH] LPS-166086 Make dialog close button accessible with keyboard
1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/plugins/dialog/plugin.js b/plugins/dialog/plugin.js
index 5101c888ff..6a38bef707 100644
index 12b89ea4d3..70c71aa8b8 100644
--- a/plugins/dialog/plugin.js
+++ b/plugins/dialog/plugin.js
@@ -160,7 +160,7 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From b426b4b037b6bc20d94efeecdb9e0fa669a790c8 Mon Sep 17 00:00:00 2001
From f636560db2c4bc5d712d9b0f7c70c7a70df7589c Mon Sep 17 00:00:00 2001
From: Antonio Ortega <[email protected]>
Date: Fri, 15 Mar 2024 16:01:20 +0100
Subject: [PATCH] LPD-19992 Validate id and name fields according to spec
Expand All @@ -8,7 +8,7 @@ Subject: [PATCH] LPD-19992 Validate id and name fields according to spec
1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/plugins/link/dialogs/link.js b/plugins/link/dialogs/link.js
index 46e452e741..39932fd2d9 100755
index 8ed45057ef..00e7228eab 100755
--- a/plugins/link/dialogs/link.js
+++ b/plugins/link/dialogs/link.js
@@ -1010,7 +1010,18 @@
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 75d4a9af69bb250569c57ad5e49398d13f6e645e Mon Sep 17 00:00:00 2001
From c717114c454a929840a3ee9738ea62aed819588f Mon Sep 17 00:00:00 2001
From: Antonio Ortega <[email protected]>
Date: Mon, 18 Mar 2024 15:20:47 +0100
Subject: [PATCH] LPD-20726 Always set some width to img container
Expand All @@ -8,7 +8,7 @@ Subject: [PATCH] LPD-20726 Always set some width to img container
1 file changed, 1 insertion(+)

diff --git a/plugins/image2/plugin.js b/plugins/image2/plugin.js
index bcf986bad4..c41fdad41c 100644
index 4460ebfd83..ec0d1e543c 100644
--- a/plugins/image2/plugin.js
+++ b/plugins/image2/plugin.js
@@ -31,6 +31,7 @@
Expand Down

0 comments on commit 063d723

Please sign in to comment.