Skip to content

fix cherry editor #572

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thmarx merged 2 commits into from
Jan 15, 2026
Merged

fix cherry editor #572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
831dbd8
* update cherry editor
thmarx Jan 15, 2026
1d46a58
Merge origin/main into main
thmarx Jan 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/ui-module/src/main/resources/manager/actions/media/edit-focal-point.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* ui-module
* %%
* Copyright (C) 2023 - 2025 CondationCMS
* Copyright (C) 2023 - 2026 CondationCMS
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Expand Down
2 changes: 1 addition & 1 deletion modules/ui-module/src/main/resources/manager/actions/media/edit-media-form.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* ui-module
* %%
* Copyright (C) 2023 - 2025 CondationCMS
* Copyright (C) 2023 - 2026 CondationCMS
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Expand Down
2 changes: 1 addition & 1 deletion modules/ui-module/src/main/resources/manager/actions/media/select-media.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* ui-module
* %%
* Copyright (C) 2023 - 2025 CondationCMS
* Copyright (C) 2023 - 2026 CondationCMS
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Expand Down
2 changes: 1 addition & 1 deletion modules/ui-module/src/main/resources/manager/actions/page/add-section.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* ui-module
* %%
* Copyright (C) 2023 - 2025 CondationCMS
* Copyright (C) 2023 - 2026 CondationCMS
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Expand Down
2 changes: 1 addition & 1 deletion modules/ui-module/src/main/resources/manager/actions/page/create-page.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* ui-module
* %%
* Copyright (C) 2023 - 2025 CondationCMS
* Copyright (C) 2023 - 2026 CondationCMS
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Expand Down
2 changes: 1 addition & 1 deletion modules/ui-module/src/main/resources/manager/actions/page/delete-section.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* ui-module
* %%
* Copyright (C) 2023 - 2025 CondationCMS
* Copyright (C) 2023 - 2026 CondationCMS
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Expand Down
2 changes: 1 addition & 1 deletion modules/ui-module/src/main/resources/manager/actions/page/edit-content.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* ui-module
* %%
* Copyright (C) 2023 - 2025 CondationCMS
* Copyright (C) 2023 - 2026 CondationCMS
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Expand Down
2 changes: 1 addition & 1 deletion modules/ui-module/src/main/resources/manager/actions/page/edit-metaattribute-list.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* ui-module
* %%
* Copyright (C) 2023 - 2025 CondationCMS
* Copyright (C) 2023 - 2026 CondationCMS
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Expand Down
1 change: 1 addition & 0 deletions modules/ui-module/src/main/resources/manager/actions/page/edit-metaattribute-list.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ export async function runAction(params) {
title: 'Edit meta attribute',
body: 'modal body',
form: form,
resizable: true,
onCancel: (event) => { },
onOk: async (event) => {
var updateData = form.getData();
Expand Down
2 changes: 1 addition & 1 deletion modules/ui-module/src/main/resources/manager/actions/page/edit-metaattribute.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* ui-module
* %%
* Copyright (C) 2023 - 2025 CondationCMS
* Copyright (C) 2023 - 2026 CondationCMS
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Expand Down
1 change: 1 addition & 0 deletions modules/ui-module/src/main/resources/manager/actions/page/edit-metaattribute.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ export async function runAction(params) {
title: 'Edit meta attribute',
body: 'modal body',
form: form,
resizable: true,
onCancel: (event) => { },
onOk: async (event) => {
var updateData = form.getData();
Expand Down
2 changes: 1 addition & 1 deletion modules/ui-module/src/main/resources/manager/actions/page/edit-page-settings.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* ui-module
* %%
* Copyright (C) 2023 - 2025 CondationCMS
* Copyright (C) 2023 - 2026 CondationCMS
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Expand Down
2 changes: 1 addition & 1 deletion modules/ui-module/src/main/resources/manager/actions/page/edit-sections.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* ui-module
* %%
* Copyright (C) 2023 - 2025 CondationCMS
* Copyright (C) 2023 - 2026 CondationCMS
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Expand Down
2 changes: 1 addition & 1 deletion modules/ui-module/src/main/resources/manager/actions/page/manage-assets.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* ui-module
* %%
* Copyright (C) 2023 - 2025 CondationCMS
* Copyright (C) 2023 - 2026 CondationCMS
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Expand Down
2 changes: 1 addition & 1 deletion modules/ui-module/src/main/resources/manager/actions/page/section-set-published.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* ui-module
* %%
* Copyright (C) 2023 - 2025 CondationCMS
* Copyright (C) 2023 - 2026 CondationCMS
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Expand Down
2 changes: 1 addition & 1 deletion modules/ui-module/src/main/resources/manager/actions/page/translations.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* ui-module
* %%
* Copyright (C) 2023 - 2025 CondationCMS
* Copyright (C) 2023 - 2026 CondationCMS
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Expand Down
2 changes: 1 addition & 1 deletion modules/ui-module/src/main/resources/manager/actions/reload-preview.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* ui-module
* %%
* Copyright (C) 2023 - 2025 CondationCMS
* Copyright (C) 2023 - 2026 CondationCMS
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Expand Down
2 changes: 1 addition & 1 deletion modules/ui-module/src/main/resources/manager/actions/site-change.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* ui-module
* %%
* Copyright (C) 2023 - 2025 CondationCMS
* Copyright (C) 2023 - 2026 CondationCMS
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Expand Down
2 changes: 1 addition & 1 deletion modules/ui-module/src/main/resources/manager/actions/test-command.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* ui-module
* %%
* Copyright (C) 2023 - 2025 CondationCMS
* Copyright (C) 2023 - 2026 CondationCMS
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Expand Down
4 changes: 2 additions & 2 deletions modules/ui-module/src/main/resources/manager/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@
<script src="https://cdn.jsdelivr.net/npm/easymde@2.20.0/dist/easymde.min.js"></script>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/easymde@2.20.0/dist/easymde.min.css" />

<script src="https://cdn.jsdelivr.net/npm/cherry-markdown@0.10.0/dist/cherry-markdown.core.min.js"></script>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/cherry-markdown@0.10.0/dist/cherry-markdown.min.css">
<script src="https://cdn.jsdelivr.net/npm/cherry-markdown@0.10.3/dist/cherry-markdown.core.min.js"></script>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/cherry-markdown@0.10.3/dist/cherry-markdown.min.css">

<link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/lipis/flag-icons@7.3.2/css/flag-icons.min.css" />

Expand Down
2 changes: 1 addition & 1 deletion modules/ui-module/src/main/resources/manager/js/manager-globals.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* ui-module
* %%
* Copyright (C) 2023 - 2025 CondationCMS
* Copyright (C) 2023 - 2026 CondationCMS
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Expand Down
2 changes: 1 addition & 1 deletion modules/ui-module/src/main/resources/manager/js/manager-inject-init.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* ui-module
* %%
* Copyright (C) 2023 - 2025 CondationCMS
* Copyright (C) 2023 - 2026 CondationCMS
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Expand Down
2 changes: 1 addition & 1 deletion modules/ui-module/src/main/resources/manager/js/manager-inject.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* ui-module
* %%
* Copyright (C) 2023 - 2025 CondationCMS
* Copyright (C) 2023 - 2026 CondationCMS
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Expand Down
2 changes: 1 addition & 1 deletion modules/ui-module/src/main/resources/manager/js/manager.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* ui-module
* %%
* Copyright (C) 2023 - 2025 CondationCMS
* Copyright (C) 2023 - 2026 CondationCMS
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Expand Down
2 changes: 1 addition & 1 deletion modules/ui-module/src/main/resources/manager/js/modules/alerts.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* ui-module
* %%
* Copyright (C) 2023 - 2025 CondationCMS
* Copyright (C) 2023 - 2026 CondationCMS
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Expand Down
2 changes: 1 addition & 1 deletion modules/ui-module/src/main/resources/manager/js/modules/event-bus.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* ui-module
* %%
* Copyright (C) 2023 - 2025 CondationCMS
* Copyright (C) 2023 - 2026 CondationCMS
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Expand Down
2 changes: 1 addition & 1 deletion modules/ui-module/src/main/resources/manager/js/modules/filebrowser.actions.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* ui-module
* %%
* Copyright (C) 2023 - 2025 CondationCMS
* Copyright (C) 2023 - 2026 CondationCMS
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Expand Down
2 changes: 1 addition & 1 deletion modules/ui-module/src/main/resources/manager/js/modules/filebrowser.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* ui-module
* %%
* Copyright (C) 2023 - 2025 CondationCMS
* Copyright (C) 2023 - 2026 CondationCMS
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Expand Down
2 changes: 1 addition & 1 deletion modules/ui-module/src/main/resources/manager/js/modules/filebrowser.template.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* ui-module
* %%
* Copyright (C) 2023 - 2025 CondationCMS
* Copyright (C) 2023 - 2026 CondationCMS
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Expand Down
2 changes: 1 addition & 1 deletion modules/ui-module/src/main/resources/manager/js/modules/filebrowser.upload.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* ui-module
* %%
* Copyright (C) 2023 - 2025 CondationCMS
* Copyright (C) 2023 - 2026 CondationCMS
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Expand Down
2 changes: 1 addition & 1 deletion modules/ui-module/src/main/resources/manager/js/modules/form/field.checkbox.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* ui-module
* %%
* Copyright (C) 2023 - 2025 CondationCMS
* Copyright (C) 2023 - 2026 CondationCMS
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Expand Down
2 changes: 1 addition & 1 deletion modules/ui-module/src/main/resources/manager/js/modules/form/field.checkbox.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* ui-module
* %%
* Copyright (C) 2023 - 2025 CondationCMS
* Copyright (C) 2023 - 2026 CondationCMS
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Expand Down
2 changes: 1 addition & 1 deletion modules/ui-module/src/main/resources/manager/js/modules/form/field.code.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* ui-module
* %%
* Copyright (C) 2023 - 2025 CondationCMS
* Copyright (C) 2023 - 2026 CondationCMS
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Expand Down
2 changes: 1 addition & 1 deletion modules/ui-module/src/main/resources/manager/js/modules/form/field.color.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* ui-module
* %%
* Copyright (C) 2023 - 2025 CondationCMS
* Copyright (C) 2023 - 2026 CondationCMS
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Expand Down
2 changes: 1 addition & 1 deletion modules/ui-module/src/main/resources/manager/js/modules/form/field.date.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* ui-module
* %%
* Copyright (C) 2023 - 2025 CondationCMS
* Copyright (C) 2023 - 2026 CondationCMS
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Expand Down
2 changes: 1 addition & 1 deletion modules/ui-module/src/main/resources/manager/js/modules/form/field.datetime.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* ui-module
* %%
* Copyright (C) 2023 - 2025 CondationCMS
* Copyright (C) 2023 - 2026 CondationCMS
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Expand Down
2 changes: 1 addition & 1 deletion modules/ui-module/src/main/resources/manager/js/modules/form/field.divider.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* ui-module
* %%
* Copyright (C) 2023 - 2025 CondationCMS
* Copyright (C) 2023 - 2026 CondationCMS
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Expand Down
2 changes: 1 addition & 1 deletion modules/ui-module/src/main/resources/manager/js/modules/form/field.easymde.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* ui-module
* %%
* Copyright (C) 2023 - 2025 CondationCMS
* Copyright (C) 2023 - 2026 CondationCMS
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Expand Down
2 changes: 1 addition & 1 deletion modules/ui-module/src/main/resources/manager/js/modules/form/field.list.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* ui-module
* %%
* Copyright (C) 2023 - 2025 CondationCMS
* Copyright (C) 2023 - 2026 CondationCMS
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Expand Down
2 changes: 1 addition & 1 deletion modules/ui-module/src/main/resources/manager/js/modules/form/field.mail.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* ui-module
* %%
* Copyright (C) 2023 - 2025 CondationCMS
* Copyright (C) 2023 - 2026 CondationCMS
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Expand Down
7 changes: 6 additions & 1 deletion modules/ui-module/src/main/resources/manager/js/modules/form/field.markdown.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* ui-module
* %%
* Copyright (C) 2023 - 2025 CondationCMS
* Copyright (C) 2023 - 2026 CondationCMS
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Expand All @@ -20,6 +20,11 @@
* #L%
*/
import { FieldOptions, FormField } from "@cms/modules/form/forms.js";
declare global {
interface HTMLInputElement {
cherryEditor?: any;
}
}
export interface MarkdownFieldOptions extends FieldOptions {
placeholder?: string;
height?: string;
Expand Down
Loading