From e27da863d32cd90ef86f24e64063faf0318c226c Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 11 Jul 2023 13:38:56 +0200
Subject: [PATCH] Upgrade CKEditor to version 4.22.1 #1119

---
 package-lock.json |  2 +-
 package.json      |  2 +-
 www/pad/csp.js    | 10 ++++++++--
 www/pad/inner.js  |  4 ++--
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c08b30e5a..786023207 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18,7 +18,7 @@
         "chainpad-listmap": "^1.0.0",
         "chainpad-netflux": "^1.0.0",
         "chainpad-server": "^5.1.0",
-        "ckeditor": "npm:ckeditor4@^4.14.1",
+        "ckeditor": "npm:ckeditor4@^4.22.1",
         "codemirror": "^5.19.0",
         "components-font-awesome": "^4.6.3",
         "croppie": "^2.5.0",
diff --git a/package.json b/package.json
index 030cbd4d2..c0831f87b 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
     "chainpad": "^5.2.6",
     "chainpad-listmap": "^1.0.0",
     "chainpad-netflux": "^1.0.0",
-    "ckeditor": "npm:ckeditor4@^4.14.1",
+    "ckeditor": "npm:ckeditor4@^4.22.1",
     "codemirror": "^5.19.0",
     "components-font-awesome": "^4.6.3",
     "croppie": "^2.5.0",
diff --git a/www/pad/csp.js b/www/pad/csp.js
index 13a40f851..7c3cd2710 100644
--- a/www/pad/csp.js
+++ b/www/pad/csp.js
@@ -108,12 +108,18 @@ define(['jquery'], function ($) {
                         var attr = $(e.currentTarget).attr('oon'+e.type);
                         if (!attr) { return; }
                         var reg = /CKEDITOR.tools.callFunction\(([0-9]+),'?([^'"]+)'?(,'([A-Za-z0-9 ]+)')?\);/;
+                        var reg2 = /CKEDITOR.tools.callFunction\(([0-9]+),'?([^'",]+)'?(,'([A-Za-z0-9 ]+)')?, this\);/;
                         var match = attr.match(reg);
-                        if (!match) { return; }
+                        var lastArg = undefined;
+                        if (!match) {
+                            match = attr.match(reg2);
+                            if (!match) { return; }
+                            lastArg = this;
+                        }
                         var f = match[1];
                         var el = match[2] !== "null" ? match[2] : null;
                         var s = $iframe.scrollTop();
-                        CKEDITOR.tools.callFunction(Number(f), el, match[4]);
+                        CKEDITOR.tools.callFunction(Number(f), el, match[4], lastArg);
                         $iframe.scrollTop(s);
                     });
 
diff --git a/www/pad/inner.js b/www/pad/inner.js
index caf3fa6da..39216c281 100644
--- a/www/pad/inner.js
+++ b/www/pad/inner.js
@@ -1413,8 +1413,8 @@ define([
 */
                 Ckeditor.dom.element.prototype.setHtml = function(a){
                     if (/callFunction/.test(a)) {
-                        a = a.replace(/on(mousedown|blur|keydown|focus|click|dragstart|mouseover|mouseout)/g, function (value) {
-                            return 'o' + value;
+                        a = a.replace(/[^o]on(mousedown|blur|keydown|focus|click|dragstart|mouseover|mouseout)/g, function (value) {
+                            return value.slice(0,1) + 'o' + value.slice(1);
                         });
                     }
                     this.$.innerHTML = a;