Skip to content

Commit

Permalink
chore: Prepare for release 4.13.1-liferay.4
Browse files Browse the repository at this point in the history
  • Loading branch information
Julien Castelain committed Mar 25, 2020
1 parent e160e7a commit 39a6345
Show file tree
Hide file tree
Showing 22 changed files with 88 additions and 55 deletions.
60 changes: 30 additions & 30 deletions ckeditor/ckeditor.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions ckeditor/samples/old/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -149,10 +149,10 @@ <h2 class="samples">
<dt><a class="samples" href="enterkey/enterkey.html">Using the &quot;Enter&quot; key in CKEditor</a></dt>
<dd>Try the latest sample of CKEditor 4 and learn more about customizing your WYSIWYG editor with endless possibilities.</dd>

<dt><a class="samples" href="htmlwriter/outputhtml.html">Output HTML</a></dt>
<dt><a class="samples" href="htmlwriter/outputforflash.html">Output for Flash</a></dt>
<dd>Try the latest sample of CKEditor 4 and learn more about customizing your WYSIWYG editor with endless possibilities.</dd>

<dt><a class="samples" href="htmlwriter/outputforflash.html">Output for Flash</a></dt>
<dt><a class="samples" href="htmlwriter/outputhtml.html">Output HTML</a></dt>
<dd>Try the latest sample of CKEditor 4 and learn more about customizing your WYSIWYG editor with endless possibilities.</dd>

<dt><a class="samples" href="toolbar/toolbar.html">Toolbar Configurations</a></dt>
Expand Down
2 changes: 1 addition & 1 deletion ckeditor/skins/kama/editor.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ckeditor/skins/kama/editor_ie.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ckeditor/skins/kama/editor_ie7.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ckeditor/skins/kama/editor_ie8.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ckeditor/skins/kama/editor_iequirks.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ckeditor/skins/moono-lisa/editor.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ckeditor/skins/moono-lisa/editor_gecko.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ckeditor/skins/moono-lisa/editor_ie.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ckeditor/skins/moono-lisa/editor_ie8.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ckeditor/skins/moono-lisa/editor_iequirks.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ckeditor/skins/moono/editor.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ckeditor/skins/moono/editor_gecko.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ckeditor/skins/moono/editor_ie.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ckeditor/skins/moono/editor_ie7.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ckeditor/skins/moono/editor_ie8.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ckeditor/skins/moono/editor_iequirks.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "liferay-ckeditor",
"version": "4.13.1-liferay.3",
"version": "4.13.1-liferay.4",
"description": "Liferay's fork of CKEditor",
"files": [
"ckeditor/**/*"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From a73a61e100ee67f37ef84eb9d7a07187cea3d01d Mon Sep 17 00:00:00 2001
From 701358c88002bacae86f39e72dbd443bae1424a8 Mon Sep 17 00:00:00 2001
From: Julien Castelain <[email protected]>
Date: Tue, 14 May 2019 10:47:25 +0200
Subject: [PATCH 1/2] LPS-89596 Cannot Drag Image from top content line in IE11
Subject: [PATCH 1/3] LPS-89596 Cannot Drag Image from top content line in IE11
using Alloy Editor

Changed position of drag icon for IE.
Expand All @@ -25,5 +25,5 @@ index aa32f0de5..289684816 100644
return;

--
2.25.0
2.17.1

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From fc4c56ae73205fac944048c78373b91f456c80cc Mon Sep 17 00:00:00 2001
From 29f835176b2454781e19d8417428d1e8a3e5b294 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 2/2] LPS-95472 Tabs in popups not appears correctly in
Subject: [PATCH 2/3] LPS-95472 Tabs in popups not appears correctly in
maximized CKEditor

Use `width: inherit` instead of `width: 100%` to work with the maximize
Expand All @@ -24,5 +24,5 @@ index 20f1ce6aa..c678b7a84 100644
contentMap = this._.contents[ contents.id ] = {},
cursor,
--
2.25.0
2.17.1

33 changes: 33 additions & 0 deletions patches/0003-LPS-85326-Remove-check-for-Webkit-browsers.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
From 4f7e79ffc85fa1de3c27e8955313c264b867e4d6 Mon Sep 17 00:00:00 2001
From: Julien Castelain <[email protected]>
Date: Wed, 25 Mar 2020 12:58:15 +0100
Subject: [PATCH 3/3] LPS-85326 - Remove check for Webkit browsers

As described in this issue
https://issues.liferay.com/browse/LPS-85326

Converting links in an unordered list (in reverse order)
throws an error in non webkit browsers.
This patch must have been skipped when we updated CKEditor
here
https://github.com/liferay/liferay-ckeditor/commit/328017c65063ac18119e244fec92d35a4c2fedef
---
core/selection.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/selection.js b/core/selection.js
index e49b6facd..cea1dd93d 100644
--- a/core/selection.js
+++ b/core/selection.js
@@ -2210,7 +2210,7 @@

var nativeRange = this.document.$.createRange();

- if ( range.collapsed && CKEDITOR.env.webkit && rangeRequiresFix( range ) ) {
+ if ( range.collapsed && rangeRequiresFix( range ) ) {
// Append a zero-width space so WebKit will not try to
// move the selection by itself (https://dev.ckeditor.com/ticket/1272).
var fillingChar = createFillingCharSequenceNode( this.root );
--
2.17.1

0 comments on commit 39a6345

Please sign in to comment.