Skip to content

Commit dce0ae5

Browse files
committed
AC-12726:: [2.4.8-beta1] TinyMCE 5 migration to TinyMCE 7
1 parent 6f4805f commit dce0ae5

File tree

132 files changed

+7523
-404
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

132 files changed

+7523
-404
lines changed

app/code/Magento/Cms/Model/Wysiwyg/DefaultConfigProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public function getConfig(\Magento\Framework\DataObject $config) : \Magento\Fram
3333
{
3434
$config->addData([
3535
'tinymce' => [
36-
'toolbar' => 'formatselect | bold italic underline | alignleft aligncenter alignright | '
36+
'toolbar' => ' styles | formatselect | bold italic underline | alignleft aligncenter alignright | '
3737
. 'bullist numlist | link table charmap',
3838
'plugins' => implode(
3939
' ',

app/code/Magento/Ui/view/base/requirejs-config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ var config = {
88
shim: {
99
'chartjs/chartjs-adapter-moment': ['moment'],
1010
'chartjs/es6-shim.min': {},
11-
'tiny_mce_5/tinymce.min': {
11+
'tiny_mce_7/tinymce.min': {
1212
exports: 'tinyMCE'
1313
}
1414
},
@@ -28,7 +28,7 @@ var config = {
2828
buttonAdapter: 'Magento_Ui/js/form/button-adapter',
2929
chartJs: 'chartjs/Chart.min',
3030
'chart.js': 'chartjs/Chart.min',
31-
tinymce: 'tiny_mce_5/tinymce.min',
31+
tinymce: 'tiny_mce_7/tinymce.min',
3232
wysiwygAdapter: 'mage/adminhtml/wysiwyg/tiny_mce/tinymce5Adapter'
3333
}
3434
}

lib/web/mage/adminhtml/events.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -171,11 +171,6 @@ define([
171171
content: 'error: error in ' + this.id + '.fireEvent():\n\nevent name: ' +
172172
eventName + '\n\nerror message: ' + e.message
173173
});
174-
} else {
175-
alert({
176-
content: 'error: error in [unknown object].fireEvent():\n\nevent name: ' +
177-
eventName + '\n\nerror message: ' + e.message
178-
});
179174
}
180175
}
181176

lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentovariable/editor_plugin.js

Lines changed: 186 additions & 191 deletions
Large diffs are not rendered by default.

lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentowidget/editor_plugin.js

Lines changed: 199 additions & 205 deletions
Large diffs are not rendered by default.

lib/web/tiny_mce_7/icons/default/icons.min.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/web/tiny_mce_7/jquery.tinymce.min.js

Lines changed: 44 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/web/tiny_mce_7/langs/README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
This is where language files should be placed.
2+
3+
Please DO NOT translate these directly, use this service instead: https://crowdin.com/project/tinymce

lib/web/tiny_mce_7/license.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Software License Agreement
2+
3+
**TinyMCE**[<https://github.com/tinymce/tinymce>](https://github.com/tinymce/tinymce)
4+
Copyright (c) 2024, Ephox Corporation DBA Tiny Technologies, Inc.
5+
6+
Licensed under the terms of [GNU General Public License Version 2 or later](http://www.gnu.org/licenses/gpl.html).

lib/web/tiny_mce_7/models/dom/model.min.js

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)