infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Remove some CSP related console errors

pull/1/head
yflory 2020-06-26 14:21:23 +02:00
parent 9d2b2ac13c
commit 1dfe8325dc
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
www/pad/csp.js
View File

@ -5,11 +5,18 @@ define(['jquery'], function ($) {
// Buttons
var $a = $('.cke_toolbox_main').find('.cke_button, .cke_combo_button');
$a.each(function (i, el) {
var attr = $(el).attr('onclick');
var reg = /CKEDITOR.tools.callFunction\(([0-9]+),this\);return false;/;
var f = attr.match(reg)[1];
$(el).click(function () {
CKEDITOR.tools.callFunction(Number(f), el);
var $el = $(el);
$el.on('keydown blur focus click', function (e) {
e.preventDefault();
var attr = $(el).attr('on'+e.type);
if (!attr) { return; }
if (e.type === "blur") { return false; }
var reg = /CKEDITOR.tools.callFunction\(([0-9]+),(this|event)\);return false;/;
var m = attr.match(reg);
if (!m) { return; }
var f = m[1];
var arg = m[2] === "this" ? el : e.originalEvent;
CKEDITOR.tools.callFunction(Number(f), arg);
});
});
@ -70,12 +77,15 @@ define(['jquery'], function ($) {
if (that.onLoad) {
that.onLoad();
}
}).contents().find('body').on('click', '.cke_button, a.cke_colormore, a.cke_colorbox, .cke_colorauto, .cke_combo_button, .cke_panel_listItem a', function (e) {
}).contents().find('body').on('click dragstart', '.cke_button, a.cke_colormore, a.cke_colorbox, .cke_colorauto, .cke_combo_button, .cke_panel_listItem a', function (e) {
e.preventDefault();
if (e.type === 'dragstart') { return false; }
var attr = $(e.currentTarget).attr('onclick');
var reg = /CKEDITOR.tools.callFunction\(([0-9]+),'([A-Za-z0-9 ]+)'(,'([A-Za-z0-9 ]+)')?\);/;
var reg = /CKEDITOR.tools.callFunction\(([0-9]+),'?([A-Za-z0-9 ?]+)'?(,'([A-Za-z0-9 ]+)')?\);/;
var match = attr.match(reg);
if (!match) { return; }
var f = match[1];
var el = match[2];
var el = match[2] !== "null" ? match[2] : null;
CKEDITOR.tools.callFunction(Number(f), el, match[4]);
});