Skip to content

[5.0] Upgrade TinyMCE to version 6 #37633

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
merged 7 commits into from
Sep 19, 2022
Merged

[5.0] Upgrade TinyMCE to version 6 #37633

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e30a530
Upgrade TinyMCE to version 6
laoneo Apr 24, 2022
b49e2b7
The depreciation was only valid for 5.10.x (#20)
dgrammatiko Apr 24, 2022
08f063a
build
laoneo May 9, 2022
d702f76
cs
laoneo May 9, 2022
0ce9557
Use the new option names (#21)
dgrammatiko May 9, 2022
9bf70df
Merge stuff
laoneo Aug 29, 2022
1ef6e7c
Merge branch '5.0-dev' into j4/tinymce/6
laoneo Sep 16, 2022
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: 2 additions & 0 deletions build/build-modules-js/init/exemptions/tinymce.es6.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,14 @@ module.exports.tinyMCE = async (packageName, version) => {
await mkdir(join(itemvendorPath, 'skins'), { mode: 0o755 });
await mkdir(join(itemvendorPath, 'themes'), { mode: 0o755 });
await mkdir(join(itemvendorPath, 'templates'), { mode: 0o755 });
await mkdir(join(itemvendorPath, 'models'), { mode: 0o755 });
}

await copyAllFiles('icons', 'tinymce', 'icons');
await copyAllFiles('plugins', 'tinymce', 'plugins');
await copyAllFiles('skins', 'tinymce', 'skins');
await copyAllFiles('themes', 'tinymce', 'themes');
await copyAllFiles('models', 'tinymce', 'models');

await copyArrayFiles('', ['tinymce.js', 'tinymce.min.js', 'changelog.txt', 'license.txt'], 'tinymce', '');

Expand Down
4 changes: 2 additions & 2 deletions build/media_source/plg_editors_tinymce/js/tinymce.es6.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@

if (buttonValues.length) {
options.setup = (editor) => {
editor.settings.readonly = readOnlyMode;
editor.mode.set(readOnlyMode ? 'readonly' : 'design');

Object.keys(icons).forEach((icon) => {
editor.ui.registry.addIcon(icon, icons[icon]);
Expand All @@ -134,7 +134,7 @@
};
} else {
options.setup = (editor) => {
editor.settings.readonly = readOnlyMode;
editor.mode.set(readOnlyMode ? 'readonly' : 'design');
};
}

Expand Down
14 changes: 7 additions & 7 deletions package-lock.json
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 package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"roboto-fontface": "^0.10.0",
"short-and-sweet": "^1.0.4",
"skipto": "^4.1.6",
"tinymce": "^5.10.2",
"tinymce": "^6.1.2",
"vue": "3.2.26",
"vuex": "^4.0.2",
"vuex-persistedstate": "^4.1.0"
Expand Down
8 changes: 6 additions & 2 deletions plugins/editors/tinymce/src/PluginTraits/DisplayTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ public function onDisplay(
}

// Convert pt to px in dropdown
$scriptOptions['fontsize_formats'] = '8px 10px 12px 14px 18px 24px 36px';
$scriptOptions['font_size_formats'] = '8px 10px 12px 14px 18px 24px 36px';

// select the languages for the "language of parts" menu
if (isset($extraOptions->content_languages) && $extraOptions->content_languages) {
Expand All @@ -401,6 +401,11 @@ public function onDisplay(
$plugins = array_merge($plugins, explode(strpos($custom_plugin, ',') !== false ? ',' : ' ', $custom_plugin));
}

// Version 6 unload removed plugins
$plugins = array_filter($plugins, function ($plugin) {
return !in_array($plugin, ['hr', 'paste', 'print']);
});

if ($custom_button) {
$toolbar1 = array_merge($toolbar1, explode(strpos($custom_button, ',') !== false ? ',' : ' ', $custom_button));
}
Expand All @@ -412,7 +417,6 @@ public function onDisplay(
$scriptOptions = array_merge(
$scriptOptions,
[
'deprecation_warnings' => JDEBUG ? true : false,
'suffix' => JDEBUG ? '' : '.min',
'baseURL' => Uri::root(true) . '/media/vendor/tinymce',
'directionality' => $language->isRtl() ? 'rtl' : 'ltr',
Expand Down
8 changes: 4 additions & 4 deletions plugins/editors/tinymce/src/PluginTraits/KnownButtons.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ public static function getKnownButtons()
'italic' => ['label' => 'Italic'],
'underline' => ['label' => 'Underline'],
'strikethrough' => ['label' => 'Strikethrough'],
'styleselect' => ['label' => Text::_('PLG_TINY_TOOLBAR_BUTTON_STYLESELECT'), 'text' => 'Formats'],
'formatselect' => ['label' => Text::_('PLG_TINY_TOOLBAR_BUTTON_FORMATSELECT'), 'text' => 'Paragraph'],
'fontselect' => ['label' => Text::_('PLG_TINY_TOOLBAR_BUTTON_FONTSELECT'), 'text' => 'Font Family'],
'fontsizeselect' => ['label' => Text::_('PLG_TINY_TOOLBAR_BUTTON_FONTSIZESELECT'), 'text' => 'Font Sizes'],
'styles' => ['label' => Text::_('PLG_TINY_TOOLBAR_BUTTON_STYLESELECT'), 'text' => 'Formats'],
'blocks' => ['label' => Text::_('PLG_TINY_TOOLBAR_BUTTON_FORMATSELECT'), 'text' => 'Paragraph'],
'fontfamily' => ['label' => Text::_('PLG_TINY_TOOLBAR_BUTTON_FONTSELECT'), 'text' => 'Font Family'],
'fontsize' => ['label' => Text::_('PLG_TINY_TOOLBAR_BUTTON_FONTSIZESELECT'), 'text' => 'Font Sizes'],

'alignleft' => ['label' => 'Align left'],
'aligncenter' => ['label' => 'Align center'],
Expand Down
2 changes: 1 addition & 1 deletion plugins/editors/tinymce/src/PluginTraits/ToolbarPresets.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public static function getToolbarPreset()
'alignleft', 'aligncenter', 'alignright', 'alignjustify', '|',
'lineheight', '|',
'styleselect', '|',
'formatselect', 'fontselect', 'fontsizeselect', '|',
'formatselect', 'fontfamily', 'fontsizeselect', '|',
'searchreplace', '|',
'bullist', 'numlist', '|',
'outdent', 'indent', '|',
Expand Down
2 changes: 1 addition & 1 deletion plugins/editors/tinymce/tinymce.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<extension type="plugin" group="editors" method="upgrade">
<name>plg_editors_tinymce</name>
<version>5.10.5</version>
<version>6.1.2</version>
<creationDate>2005-08</creationDate>
<author>Tiny Technologies, Inc</author>
<authorEmail>N/A</authorEmail>
Expand Down