Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-04 20:36:13 +01:00
Code Issues Packages Projects Releases Activity

client: Use build of CKEditor containing both types

Browse Source
This commit is contained in:
Elian Doran
2024-11-09 14:11:15 +02:00
parent 06262adf91
commit 3972bb2ecf
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/ckeditor/ckeditor.js vendored
View File

File diff suppressed because one or more lines are too long

2
libraries/ckeditor/ckeditor.js.map
View File

File diff suppressed because one or more lines are too long

5
src/public/app/widgets/type_widgets/editable_text.js
View File

@@ -131,6 +131,7 @@ export default class EditableTextTypeWidget extends AbstractTextTypeWidget {
async initEditor() { async initEditor() {
await libraryLoader.requireLibrary(libraryLoader.CKEDITOR); await libraryLoader.requireLibrary(libraryLoader.CKEDITOR);
const editorClass = CKEditor.DecoupledEditor;
const codeBlockLanguages = buildListOfLanguages(); const codeBlockLanguages = buildListOfLanguages();
@@ -139,7 +140,7 @@ export default class EditableTextTypeWidget extends AbstractTextTypeWidget {
// display of $widget in both branches. // display of $widget in both branches.
this.$widget.show(); this.$widget.show();
this.watchdog = new EditorWatchdog(DecoupledEditor, { this.watchdog = new EditorWatchdog(editorClass, {
// An average number of milliseconds between the last editor errors (defaults to 5000). // An average number of milliseconds between the last editor errors (defaults to 5000).
// When the period of time between errors is lower than that and the crashNumberLimit // When the period of time between errors is lower than that and the crashNumberLimit
// is also reached, the watchdog changes its state to crashedPermanently, and it stops // is also reached, the watchdog changes its state to crashedPermanently, and it stops
@@ -175,7 +176,7 @@ export default class EditableTextTypeWidget extends AbstractTextTypeWidget {
}); });
this.watchdog.setCreator(async (elementOrData, editorConfig) => { this.watchdog.setCreator(async (elementOrData, editorConfig) => {
const editor = await DecoupledEditor.create(elementOrData, editorConfig); const editor = await editorClass.create(elementOrData, editorConfig);
await initSyntaxHighlighting(editor); await initSyntaxHighlighting(editor);