dnrops
/
cryptpad
mirror of https://github.com/xwiki-labs/cryptpad
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade CKEditor to version 4.22.1 #1119

This commit is contained in:
yflory 2023-07-11 13:38:56 +02:00
parent 1c8fb8077a
commit e27da863d3
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package-lock.json generated
View File

@ -18,7 +18,7 @@
"chainpad-listmap": "^1.0.0", "chainpad-listmap": "^1.0.0",
"chainpad-netflux": "^1.0.0", "chainpad-netflux": "^1.0.0",
"chainpad-server": "^5.1.0", "chainpad-server": "^5.1.0",
"ckeditor": "npm:ckeditor4@^4.14.1", "ckeditor": "npm:ckeditor4@^4.22.1",
"codemirror": "^5.19.0", "codemirror": "^5.19.0",
"components-font-awesome": "^4.6.3", "components-font-awesome": "^4.6.3",
"croppie": "^2.5.0", "croppie": "^2.5.0",

2
package.json
View File

@ -39,7 +39,7 @@
"chainpad": "^5.2.6", "chainpad": "^5.2.6",
"chainpad-listmap": "^1.0.0", "chainpad-listmap": "^1.0.0",
"chainpad-netflux": "^1.0.0", "chainpad-netflux": "^1.0.0",
"ckeditor": "npm:ckeditor4@^4.14.1", "ckeditor": "npm:ckeditor4@^4.22.1",
"codemirror": "^5.19.0", "codemirror": "^5.19.0",
"components-font-awesome": "^4.6.3", "components-font-awesome": "^4.6.3",
"croppie": "^2.5.0", "croppie": "^2.5.0",

8
www/pad/csp.js
View File

@ -108,12 +108,18 @@ define(['jquery'], function ($) {
var attr = $(e.currentTarget).attr('oon'+e.type); var attr = $(e.currentTarget).attr('oon'+e.type);
if (!attr) { return; } if (!attr) { return; }
var reg = /CKEDITOR.tools.callFunction\(([0-9]+),'?([^'"]+)'?(,'([A-Za-z0-9 ]+)')?\);/; 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); var match = attr.match(reg);
var lastArg = undefined;
if (!match) {
match = attr.match(reg2);
if (!match) { return; } if (!match) { return; }
lastArg = this;
}
var f = match[1]; var f = match[1];
var el = match[2] !== "null" ? match[2] : null; var el = match[2] !== "null" ? match[2] : null;
var s = $iframe.scrollTop(); var s = $iframe.scrollTop();
CKEDITOR.tools.callFunction(Number(f), el, match[4]); CKEDITOR.tools.callFunction(Number(f), el, match[4], lastArg);
$iframe.scrollTop(s); $iframe.scrollTop(s);
}); });

4
www/pad/inner.js
View File

@ -1413,8 +1413,8 @@ define([
*/ */
Ckeditor.dom.element.prototype.setHtml = function(a){ Ckeditor.dom.element.prototype.setHtml = function(a){
if (/callFunction/.test(a)) { if (/callFunction/.test(a)) {
a = a.replace(/on(mousedown|blur|keydown|focus|click|dragstart|mouseover|mouseout)/g, function (value) { a = a.replace(/[^o]on(mousedown|blur|keydown|focus|click|dragstart|mouseover|mouseout)/g, function (value) {
return 'o' + value; return value.slice(0,1) + 'o' + value.slice(1);
}); });
} }
this.$.innerHTML = a; this.$.innerHTML = a;