Skip to content

Bugfix/edit config template and classes #494

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

Open
i-just wants to merge 3 commits into
base: 4.x
Choose a base branch
from
+17 −14
Open

Bugfix/edit config template and classes #494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a721df2
use correct set of classes when initialising code editor fields
i-just Jan 14, 2026
3a3c8bd
switch from merge to push
i-just Jan 14, 2026
e9ff7a3
added style for has-errors class
i-just Jan 14, 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
23 changes: 11 additions & 12 deletions src/templates/cke-configs/_edit.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,8 @@
}) %}
{% endif %}

{% set baseCodeEditorOptions = {
wrapperClass: 'monaco-editor-background-frame',
} %}
{% set wrapperClasses = ['monaco-editor-background-frame'] %}
{% set baseCodeEditorOptions = {} %}

{% if ckeConfig.uid %}
{{ hiddenInput('uid', ckeConfig.uid) }}
Expand Down Expand Up @@ -124,16 +123,17 @@

{% set classes = [] %}
{% if not isJson %}
{% set classes = classes|merge(['hidden']) %}
{% set classes = classes|push('hidden') %}
{% endif %}
{% if readOnly %}
{% set classes = classes|merge(['disabled']) %}
{% set classes = classes|push('disabled') %}
{% endif %}

{% tag 'div' with {
id: 'config-options-json-container',
class: classes|join(' '),
} %}
{% set wrapperClasses = wrapperClasses|push(ckeConfig.hasErrors('json') ? 'has-errors') %}
{{ codeEditor.textarea(
{
id: 'config-options-json',
Expand All @@ -144,17 +144,17 @@
baseMonacoOptions|merge({
language: 'json',
}),
baseCodeEditorOptions|push(ckeConfig.hasErrors('json') ? 'has-errors'),
baseCodeEditorOptions|merge({wrapperClass: wrapperClasses|join(' ')}),
) }}
{% endtag %}


{% set classes = [] %}
{% if not isJs %}
{% set classes = classes|merge(['hidden']) %}
{% set classes = classes|push('hidden') %}
{% endif %}
{% if readOnly %}
{% set classes = classes|merge(['disabled']) %}
{% set classes = classes|push('disabled') %}
{% endif %}
{% tag 'div' with {
id: 'config-options-js-container',
Expand All @@ -170,7 +170,7 @@
baseMonacoOptions|merge({
language: 'javascript',
}),
baseCodeEditorOptions,
baseCodeEditorOptions|merge({wrapperClass: wrapperClasses|join(' ')}),
) }}
{% endtag %}
{% endblock %}
Expand Down Expand Up @@ -201,6 +201,7 @@
})()
{% endjs %}

{% set wrapperClasses = wrapperClasses|push(readOnly ? 'disabled') %}
{{ codeEditor.textareaField(
{
label: 'Custom Styles'|t('ckeditor'),
Expand All @@ -215,7 +216,5 @@
baseMonacoOptions|merge({
language: 'css',
}),
baseCodeEditorOptions|merge({
wrapperClass: readOnly ? 'disabled' : null,
}),
baseCodeEditorOptions|merge({wrapperClass: wrapperClasses|join(' ')}),
) }}
2 changes: 1 addition & 1 deletion src/web/assets/ckeconfig/dist/css/ckeconfig.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/web/assets/ckeconfig/dist/css/ckeconfig.css.map
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions src/web/assets/ckeconfig/src/ckeconfig.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,3 +134,7 @@ body:not(.dragging) .ckeditor-tb--item:hover {
box-shadow: none !important;
padding: 0 !important;
}

.monaco-editor.has-errors {
border: 1px solid var(--fg-error) !important;
}
Loading