Skip to content

Commit c36e780

Browse files
committed
Merge remote-tracking branch 'origin/TinyMCE7' into Hammer-Plateform-Health-04Sept24
2 parents 20b80b7 + ea4e217 commit c36e780

File tree

6 files changed

+3
-23
lines changed

6 files changed

+3
-23
lines changed

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,7 @@ public function getConfig(\Magento\Framework\DataObject $config) : \Magento\Fram
4444
'link',
4545
'charmap',
4646
'media',
47-
'noneditable',
4847
'table',
49-
'paste',
5048
'code',
5149
'help',
5250
'table'

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@
343343
"components/jquery": "1.11.0",
344344
"components/jqueryui": "1.10.4",
345345
"twbs/bootstrap": "3.1.0",
346-
"tinymce/tinymce": "3.4.7",
346+
"tinymce/tinymce": "7.3.0",
347347
"magento/module-csp": "*",
348348
"magento/module-aws-s3": "*",
349349
"magento/module-remote-storage": "*",

dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromClone/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@
161161
"blueimp/jquery-file-upload": "5.6.14",
162162
"components/jqueryui": "1.10.4",
163163
"twbs/bootstrap": "3.1.0",
164-
"tinymce/tinymce": "3.4.7"
164+
"tinymce/tinymce": "7.3.0"
165165
},
166166
"extra": {
167167
"component_paths": {

lib/internal/Magento/Framework/App/Test/Unit/_files/test.composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
},
2323
"replace": {
2424
"magento/module-marketplace": "100.0.2",
25-
"tinymce/tinymce": "3.4.7"
25+
"tinymce/tinymce": "7.3.0"
2626
},
2727
"extra": {
2828
"component_paths": {

lib/web/tiny_mce_7/plugins/noneditable/plugin.min.js

Lines changed: 0 additions & 9 deletions
This file was deleted.

lib/web/tiny_mce_7/plugins/paste/plugin.min.js

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)