Skip to content

Commit 0c4c26c

Browse files
smulvih2smulvih2
committed
Fix breaking change from CKE5 v45+ with icons for alert and panel plugins
1 parent e025538 commit 0c4c26c

File tree

8 files changed

+5981
-12006
lines changed

8 files changed

+5981
-12006
lines changed

‎modules/custom/wxt_ext/wxt_ext_editor/js/build/wxt_alert.js‎

Lines changed: 36 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -11,41 +11,48 @@
1111
return /******/ (() => { // webpackBootstrap
1212
/******/ var __webpack_modules__ = ({
1313

14-
/***/ "ckeditor5/src/core.js":
15-
/***/ ((module, __unused_webpack_exports, __webpack_require__) => {
14+
/***/ "ckeditor5/src/core.js"
15+
(module, __unused_webpack_exports, __webpack_require__) {
1616

1717
module.exports = (__webpack_require__("dll-reference CKEditor5.dll"))("./src/core.js");
1818

19-
/***/ }),
19+
/***/ },
2020

21-
/***/ "ckeditor5/src/ui.js":
22-
/***/ ((module, __unused_webpack_exports, __webpack_require__) => {
21+
/***/ "ckeditor5/src/icons.js"
22+
(module, __unused_webpack_exports, __webpack_require__) {
23+
24+
module.exports = (__webpack_require__("dll-reference CKEditor5.dll"))("./src/icons.js");
25+
26+
/***/ },
27+
28+
/***/ "ckeditor5/src/ui.js"
29+
(module, __unused_webpack_exports, __webpack_require__) {
2330

2431
module.exports = (__webpack_require__("dll-reference CKEditor5.dll"))("./src/ui.js");
2532

26-
/***/ }),
33+
/***/ },
2734

28-
/***/ "ckeditor5/src/utils.js":
29-
/***/ ((module, __unused_webpack_exports, __webpack_require__) => {
35+
/***/ "ckeditor5/src/utils.js"
36+
(module, __unused_webpack_exports, __webpack_require__) {
3037

3138
module.exports = (__webpack_require__("dll-reference CKEditor5.dll"))("./src/utils.js");
3239

33-
/***/ }),
40+
/***/ },
3441

35-
/***/ "ckeditor5/src/widget.js":
36-
/***/ ((module, __unused_webpack_exports, __webpack_require__) => {
42+
/***/ "ckeditor5/src/widget.js"
43+
(module, __unused_webpack_exports, __webpack_require__) {
3744

3845
module.exports = (__webpack_require__("dll-reference CKEditor5.dll"))("./src/widget.js");
3946

40-
/***/ }),
47+
/***/ },
4148

42-
/***/ "dll-reference CKEditor5.dll":
43-
/***/ ((module) => {
49+
/***/ "dll-reference CKEditor5.dll"
50+
(module) {
4451

4552
"use strict";
4653
module.exports = CKEditor5.dll;
4754

48-
/***/ })
55+
/***/ }
4956

5057
/******/ });
5158
/************************************************************************/
@@ -93,7 +100,7 @@ module.exports = CKEditor5.dll;
93100
/******/
94101
/************************************************************************/
95102
var __webpack_exports__ = {};
96-
// This entry need to be wrapped in an IIFE because it need to be in strict mode.
103+
// This entry needs to be wrapped in an IIFE because it needs to be in strict mode.
97104
(() => {
98105
"use strict";
99106

@@ -106,14 +113,14 @@ __webpack_require__.d(__webpack_exports__, {
106113
var delegated_corefrom_dll_reference_CKEditor5 = __webpack_require__("ckeditor5/src/core.js");
107114
// EXTERNAL MODULE: delegated ./widget.js from dll-reference CKEditor5.dll
108115
var delegated_widgetfrom_dll_reference_CKEditor5 = __webpack_require__("ckeditor5/src/widget.js");
109-
;// CONCATENATED MODULE: ./js/ckeditor5_plugins/wxt_alert/src/alertcssclasses.js
116+
;// ./js/ckeditor5_plugins/wxt_alert/src/alertcssclasses.js
110117
const AlertClasses = [
111118
'info',
112119
'success',
113120
'danger',
114121
'warning'
115122
];
116-
;// CONCATENATED MODULE: ./js/ckeditor5_plugins/wxt_alert/src/insertalertcommand.js
123+
;// ./js/ckeditor5_plugins/wxt_alert/src/insertalertcommand.js
117124

118125

119126

@@ -230,7 +237,7 @@ function getAlertTemplate(writer, alertClass, headingLevel) {
230237
return alert;
231238
}
232239

233-
;// CONCATENATED MODULE: ./js/ckeditor5_plugins/wxt_alert/src/alertediting.js
240+
;// ./js/ckeditor5_plugins/wxt_alert/src/alertediting.js
234241

235242

236243

@@ -374,7 +381,9 @@ class AlertEditing extends delegated_corefrom_dll_reference_CKEditor5.Plugin {
374381
var delegated_uifrom_dll_reference_CKEditor5 = __webpack_require__("ckeditor5/src/ui.js");
375382
// EXTERNAL MODULE: delegated ./utils.js from dll-reference CKEditor5.dll
376383
var delegated_utilsfrom_dll_reference_CKEditor5 = __webpack_require__("ckeditor5/src/utils.js");
377-
;// CONCATENATED MODULE: ./js/ckeditor5_plugins/wxt_alert/src/alertview.js
384+
// EXTERNAL MODULE: delegated ./icons.js from dll-reference CKEditor5.dll
385+
var delegated_iconsfrom_dll_reference_CKEditor5 = __webpack_require__("ckeditor5/src/icons.js");
386+
;// ./js/ckeditor5_plugins/wxt_alert/src/alertview.js
378387

379388

380389

@@ -396,9 +405,9 @@ class FormView extends delegated_uifrom_dll_reference_CKEditor5.View {
396405
const headingItems = new delegated_utilsfrom_dll_reference_CKEditor5.Collection();
397406

398407
// Create save and cancel buttons
399-
this.saveButtonView = this._createButton('Save', delegated_corefrom_dll_reference_CKEditor5.icons.check, 'ck-button-save');
408+
this.saveButtonView = this._createButton('Save', delegated_iconsfrom_dll_reference_CKEditor5.IconCheck, 'ck-button-save');
400409
this.saveButtonView.type = 'submit';
401-
this.cancelButtonView = this._createButton('Cancel', delegated_corefrom_dll_reference_CKEditor5.icons.cancel, 'ck-button-cancel');
410+
this.cancelButtonView = this._createButton('Cancel', delegated_iconsfrom_dll_reference_CKEditor5.IconCancel, 'ck-button-cancel');
402411
this.cancelButtonView.delegate('execute').to(this, 'cancel');
403412

404413
// create button for each alert class and add to the collection of buttons for the dropdown list
@@ -496,9 +505,9 @@ class FormView extends delegated_uifrom_dll_reference_CKEditor5.View {
496505
}
497506
}
498507

499-
;// CONCATENATED MODULE: ./icons/alert.svg
508+
;// ./icons/alert.svg
500509
/* harmony default export */ const icons_alert = ("<?xml version=\"1.0\" encoding=\"UTF-8\"?><svg id=\"Layer_2\" xmlns=\"http://www.w3.org/2000/svg\" width=\"32\" height=\"28\" viewBox=\"0 0 32 28\"><g id=\"Layer_1-2\"><path id=\"alert\" d=\"m31.75,25.22L17.61.92c-.72-1.23-2.51-1.23-3.23,0L.25,25.22c-.72,1.23.18,2.78,1.61,2.78h28.27c1.43,0,2.33-1.54,1.61-2.78Zm-15.75.81c-1.33,0-2.35-1.01-2.35-2.27s1.02-2.33,2.35-2.33,2.35,1.04,2.35,2.33-1.05,2.27-2.35,2.27Zm2.66-17.16l-.96,9.98c-.04.51-.52.73-1.4.73h-.61c-.87,0-1.35-.23-1.4-.73l-.96-9.98v-.63c0-.51.52-.78,1.35-.78h2.62c.83,0,1.35.28,1.35.78v.63Z\" stroke-width=\"0\"/></g></svg>");
501-
;// CONCATENATED MODULE: ./js/ckeditor5_plugins/wxt_alert/src/alertui.js
510+
;// ./js/ckeditor5_plugins/wxt_alert/src/alertui.js
502511

503512

504513

@@ -537,11 +546,9 @@ class AlertUI extends delegated_corefrom_dll_reference_CKEditor5.Plugin {
537546
const headingLevel = formView.headingDropdown.selectedValue || 'h3';
538547

539548
if (alerttype === null || typeof alerttype === 'undefined') {
540-
return; // Optionally show validation message
549+
return;
541550
}
542551

543-
console.log(alerttype);
544-
545552
let selectionAncestors = editor.model.document.selection.getFirstPosition().getAncestors();
546553
let selectionIsAlert = false;
547554
let selection = null;
@@ -655,7 +662,7 @@ class AlertUI extends delegated_corefrom_dll_reference_CKEditor5.Plugin {
655662
}
656663
}
657664

658-
;// CONCATENATED MODULE: ./js/ckeditor5_plugins/wxt_alert/src/alert.js
665+
;// ./js/ckeditor5_plugins/wxt_alert/src/alert.js
659666

660667

661668

@@ -665,7 +672,7 @@ class Alert extends delegated_corefrom_dll_reference_CKEditor5.Plugin {
665672
return [AlertEditing, AlertUI];
666673
}
667674
}
668-
;// CONCATENATED MODULE: ./js/ckeditor5_plugins/wxt_alert/src/index.js
675+
;// ./js/ckeditor5_plugins/wxt_alert/src/index.js
669676
/**
670677
* @file The build process always expects an index.js file. Anything exported
671678
* here will be recognized by CKEditor 5 as an available plugin. Multiple

‎modules/custom/wxt_ext/wxt_ext_editor/js/build/wxt_panel.js‎

Lines changed: 35 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -11,41 +11,48 @@
1111
return /******/ (() => { // webpackBootstrap
1212
/******/ var __webpack_modules__ = ({
1313

14-
/***/ "ckeditor5/src/core.js":
15-
/***/ ((module, __unused_webpack_exports, __webpack_require__) => {
14+
/***/ "ckeditor5/src/core.js"
15+
(module, __unused_webpack_exports, __webpack_require__) {
1616

1717
module.exports = (__webpack_require__("dll-reference CKEditor5.dll"))("./src/core.js");
1818

19-
/***/ }),
19+
/***/ },
2020

21-
/***/ "ckeditor5/src/ui.js":
22-
/***/ ((module, __unused_webpack_exports, __webpack_require__) => {
21+
/***/ "ckeditor5/src/icons.js"
22+
(module, __unused_webpack_exports, __webpack_require__) {
23+
24+
module.exports = (__webpack_require__("dll-reference CKEditor5.dll"))("./src/icons.js");
25+
26+
/***/ },
27+
28+
/***/ "ckeditor5/src/ui.js"
29+
(module, __unused_webpack_exports, __webpack_require__) {
2330

2431
module.exports = (__webpack_require__("dll-reference CKEditor5.dll"))("./src/ui.js");
2532

26-
/***/ }),
33+
/***/ },
2734

28-
/***/ "ckeditor5/src/utils.js":
29-
/***/ ((module, __unused_webpack_exports, __webpack_require__) => {
35+
/***/ "ckeditor5/src/utils.js"
36+
(module, __unused_webpack_exports, __webpack_require__) {
3037

3138
module.exports = (__webpack_require__("dll-reference CKEditor5.dll"))("./src/utils.js");
3239

33-
/***/ }),
40+
/***/ },
3441

35-
/***/ "ckeditor5/src/widget.js":
36-
/***/ ((module, __unused_webpack_exports, __webpack_require__) => {
42+
/***/ "ckeditor5/src/widget.js"
43+
(module, __unused_webpack_exports, __webpack_require__) {
3744

3845
module.exports = (__webpack_require__("dll-reference CKEditor5.dll"))("./src/widget.js");
3946

40-
/***/ }),
47+
/***/ },
4148

42-
/***/ "dll-reference CKEditor5.dll":
43-
/***/ ((module) => {
49+
/***/ "dll-reference CKEditor5.dll"
50+
(module) {
4451

4552
"use strict";
4653
module.exports = CKEditor5.dll;
4754

48-
/***/ })
55+
/***/ }
4956

5057
/******/ });
5158
/************************************************************************/
@@ -93,7 +100,7 @@ module.exports = CKEditor5.dll;
93100
/******/
94101
/************************************************************************/
95102
var __webpack_exports__ = {};
96-
// This entry need to be wrapped in an IIFE because it need to be in strict mode.
103+
// This entry needs to be wrapped in an IIFE because it needs to be in strict mode.
97104
(() => {
98105
"use strict";
99106

@@ -106,7 +113,7 @@ __webpack_require__.d(__webpack_exports__, {
106113
var delegated_corefrom_dll_reference_CKEditor5 = __webpack_require__("ckeditor5/src/core.js");
107114
// EXTERNAL MODULE: delegated ./widget.js from dll-reference CKEditor5.dll
108115
var delegated_widgetfrom_dll_reference_CKEditor5 = __webpack_require__("ckeditor5/src/widget.js");
109-
;// CONCATENATED MODULE: ./js/ckeditor5_plugins/wxt_panel/src/panelcssclasses.js
116+
;// ./js/ckeditor5_plugins/wxt_panel/src/panelcssclasses.js
110117
const PanelClasses = [
111118
'primary',
112119
'default',
@@ -116,7 +123,7 @@ const PanelClasses = [
116123
'danger',
117124
'warning'
118125
];
119-
;// CONCATENATED MODULE: ./js/ckeditor5_plugins/wxt_panel/src/insertpanelcommand.js
126+
;// ./js/ckeditor5_plugins/wxt_panel/src/insertpanelcommand.js
120127

121128

122129

@@ -236,7 +243,7 @@ function getPanelTemplate(writer, panelClass) {
236243

237244
return panel;
238245
}
239-
;// CONCATENATED MODULE: ./js/ckeditor5_plugins/wxt_panel/src/panelediting.js
246+
;// ./js/ckeditor5_plugins/wxt_panel/src/panelediting.js
240247

241248

242249

@@ -425,7 +432,9 @@ class PanelEditing extends delegated_corefrom_dll_reference_CKEditor5.Plugin {
425432
var delegated_uifrom_dll_reference_CKEditor5 = __webpack_require__("ckeditor5/src/ui.js");
426433
// EXTERNAL MODULE: delegated ./utils.js from dll-reference CKEditor5.dll
427434
var delegated_utilsfrom_dll_reference_CKEditor5 = __webpack_require__("ckeditor5/src/utils.js");
428-
;// CONCATENATED MODULE: ./js/ckeditor5_plugins/wxt_panel/src/panelview.js
435+
// EXTERNAL MODULE: delegated ./icons.js from dll-reference CKEditor5.dll
436+
var delegated_iconsfrom_dll_reference_CKEditor5 = __webpack_require__("ckeditor5/src/icons.js");
437+
;// ./js/ckeditor5_plugins/wxt_panel/src/panelview.js
429438

430439

431440

@@ -445,9 +454,9 @@ class FormView extends delegated_uifrom_dll_reference_CKEditor5.View {
445454
const items = new delegated_utilsfrom_dll_reference_CKEditor5.Collection();
446455

447456
// Create save and cancel buttons
448-
this.saveButtonView = this._createButton('Save', delegated_corefrom_dll_reference_CKEditor5.icons.check, 'ck-button-save');
457+
this.saveButtonView = this._createButton('Save', delegated_iconsfrom_dll_reference_CKEditor5.IconCheck, 'ck-button-save');
449458
this.saveButtonView.type = 'submit';
450-
this.cancelButtonView = this._createButton('Cancel', delegated_corefrom_dll_reference_CKEditor5.icons.cancel, 'ck-button-cancel');
459+
this.cancelButtonView = this._createButton('Cancel', delegated_iconsfrom_dll_reference_CKEditor5.IconCancel, 'ck-button-cancel');
451460
this.cancelButtonView.delegate('execute').to(this, 'cancel');
452461

453462
// Create the dropdown list from array of panel classes
@@ -517,9 +526,9 @@ class FormView extends delegated_uifrom_dll_reference_CKEditor5.View {
517526
return button;
518527
}
519528
}
520-
;// CONCATENATED MODULE: ./icons/panel.svg
529+
;// ./icons/panel.svg
521530
/* harmony default export */ const panel = ("<?xml version=\"1.0\" encoding=\"UTF-8\"?><svg id=\"Layer_2\" xmlns=\"http://www.w3.org/2000/svg\" width=\"50\" height=\"30\" viewBox=\"0 0 50 30\"><g id=\"Layer_1-2\"><path id=\"panel\" d=\"m0,0v30h50V0H0Zm2.98,2.93h19.52v4.56H2.98V2.93Zm44.04,24.29H2.98V10.49h44.04v16.73Z\" stroke-width=\"0\"/></g></svg>");
522-
;// CONCATENATED MODULE: ./js/ckeditor5_plugins/wxt_panel/src/panelui.js
531+
;// ./js/ckeditor5_plugins/wxt_panel/src/panelui.js
523532

524533

525534

@@ -649,7 +658,7 @@ class PanelUI extends delegated_corefrom_dll_reference_CKEditor5.Plugin {
649658
};
650659
}
651660
}
652-
;// CONCATENATED MODULE: ./js/ckeditor5_plugins/wxt_panel/src/panel.js
661+
;// ./js/ckeditor5_plugins/wxt_panel/src/panel.js
653662

654663

655664

@@ -659,7 +668,7 @@ class Panel extends delegated_corefrom_dll_reference_CKEditor5.Plugin {
659668
return [PanelEditing, PanelUI];
660669
}
661670
}
662-
;// CONCATENATED MODULE: ./js/ckeditor5_plugins/wxt_panel/src/index.js
671+
;// ./js/ckeditor5_plugins/wxt_panel/src/index.js
663672

664673

665674
/* harmony default export */ const src = ({

‎modules/custom/wxt_ext/wxt_ext_editor/js/ckeditor5_plugins/wxt_alert/src/alertui.js‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,9 @@ export default class AlertUI extends Plugin {
3636
const headingLevel = formView.headingDropdown.selectedValue || 'h3';
3737

3838
if (alerttype === null || typeof alerttype === 'undefined') {
39-
return; // Optionally show validation message
39+
return;
4040
}
4141

42-
console.log(alerttype);
43-
4442
let selectionAncestors = editor.model.document.selection.getFirstPosition().getAncestors();
4543
let selectionIsAlert = false;
4644
let selection = null;

‎modules/custom/wxt_ext/wxt_ext_editor/js/ckeditor5_plugins/wxt_alert/src/alertview.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
ViewModel,
88
} from 'ckeditor5/src/ui';
99
import { Collection } from 'ckeditor5/src/utils';
10-
import { icons } from 'ckeditor5/src/core';
10+
import { IconCheck, IconCancel } from 'ckeditor5/src/icons';
1111
import { AlertClasses } from './alertcssclasses';
1212

1313
/*
@@ -26,9 +26,9 @@ export default class FormView extends View {
2626
const headingItems = new Collection();
2727

2828
// Create save and cancel buttons
29-
this.saveButtonView = this._createButton('Save', icons.check, 'ck-button-save');
29+
this.saveButtonView = this._createButton('Save', IconCheck, 'ck-button-save');
3030
this.saveButtonView.type = 'submit';
31-
this.cancelButtonView = this._createButton('Cancel', icons.cancel, 'ck-button-cancel');
31+
this.cancelButtonView = this._createButton('Cancel', IconCancel, 'ck-button-cancel');
3232
this.cancelButtonView.delegate('execute').to(this, 'cancel');
3333

3434
// create button for each alert class and add to the collection of buttons for the dropdown list

‎modules/custom/wxt_ext/wxt_ext_editor/js/ckeditor5_plugins/wxt_panel/src/panelview.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
ViewModel
88
} from 'ckeditor5/src/ui';
99
import { Collection } from 'ckeditor5/src/utils'
10-
import { icons } from 'ckeditor5/src/core';
10+
import { IconCheck, IconCancel } from 'ckeditor5/src/icons';
1111
import { PanelClasses } from './panelcssclasses';
1212

1313
/*
@@ -24,9 +24,9 @@ export default class FormView extends View {
2424
const items = new Collection();
2525

2626
// Create save and cancel buttons
27-
this.saveButtonView = this._createButton('Save', icons.check, 'ck-button-save');
27+
this.saveButtonView = this._createButton('Save', IconCheck, 'ck-button-save');
2828
this.saveButtonView.type = 'submit';
29-
this.cancelButtonView = this._createButton('Cancel', icons.cancel, 'ck-button-cancel');
29+
this.cancelButtonView = this._createButton('Cancel', IconCancel, 'ck-button-cancel');
3030
this.cancelButtonView.delegate('execute').to(this, 'cancel');
3131

3232
// Create the dropdown list from array of panel classes

0 commit comments

Comments
 (0)