Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 0 additions & 5 deletions public/default-tinymce-config.js

This file was deleted.

9 changes: 9 additions & 0 deletions src/Twig/TinymceTwigExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ public function getFunctions(): array
new TwigFunction('tinymce', [$this, 'tinymceEditor'], ['needs_environment' => true]),
new TwigFunction('tinymce_scripts', [$this, 'tinymceScripts'], ['needs_environment' => true]),
new TwigFunction('tinymce_attributes', [$this, 'tinymceAttributes']),
new TwigFunction('tinymce_config_variable_name', [$this, 'tinymceConfigVariableName']),
];
}

Expand Down Expand Up @@ -70,4 +71,12 @@ public function tinymceEditor(Environment $environment, mixed $data, array $cust

return new Markup($elementHtml, 'utf-8');
}

/**
* Returns the Javascript variable name for additional TinyMCE configurations.
*/
public function tinymceConfigVariableName(): string
{
return $this->tinymceConfigurator->getGlobalAttributes()['config'] ?? 'tinymceAdditionalConfig';
}
}
2 changes: 1 addition & 1 deletion templates/form/tinymce_type.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
{% endwith %}
src="{{ asset('bundles/tinymce/ext/tinymce/tinymce.min.js') }}"
>{{ value }}</tinymce-editor>
<script src="{{ asset('bundles/tinymce/default-tinymce-config.js') }}" type="module"></script>
{% include '@Tinymce/partial/default_tinymce_config.html.twig' %}
<script src="{{ asset('bundles/tinymce/ext/tinymce-webcomponent.js') }}" type="module"></script>
<noscript>
<textarea id="{{ id }}-noscript"
Expand Down
7 changes: 7 additions & 0 deletions templates/partial/default_tinymce_config.html.twig
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<script type="module">
if (typeof window.{{ tinymce_config_variable_name() }} === 'undefined') {
window.{{ tinymce_config_variable_name() }} = {
license_key: 'gpl',
};
}
</script>
2 changes: 1 addition & 1 deletion templates/twig/tinymce_editor.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
{{ attributes }}
src="{{ asset('bundles/tinymce/ext/tinymce/tinymce.min.js') }}"
>{{ data }}</tinymce-editor>
<script src="{{ asset('bundles/tinymce/default-tinymce-config.js') }}" type="module"></script>
{% include '@Tinymce/partial/default_tinymce_config.html.twig' %}
<script src="{{ asset('bundles/tinymce/ext/tinymce-webcomponent.js') }}" type="module"></script>
2 changes: 1 addition & 1 deletion templates/twig/tinymce_scripts.html.twig
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<script src="{{ asset('bundles/tinymce/ext/tinymce/tinymce.min.js') }}"></script>
<script src="{{ asset('bundles/tinymce/default-tinymce-config.js') }}" type="module"></script>
{% include '@Tinymce/partial/default_tinymce_config.html.twig' %}
<script src="{{ asset('bundles/tinymce/ext/tinymce-webcomponent.js') }}" type="module"></script>