Skip to content

Commit 39d4592

Browse files
committed
Merge remote-tracking branch 'origin/AC-12726' into Hammer-Plateform-Health-17July24
2 parents 3cf4028 + 729d3ce commit 39d4592

File tree

143 files changed

+7437
-299
lines changed

Some content is hidden

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

143 files changed

+7437
-299
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' => ' blocks | formatselect | bold italic underline | alignleft aligncenter alignright | '
3737
. 'bullist numlist | link table charmap',
3838
'plugins' => implode(
3939
' ',

app/code/Magento/Cms/Test/Mftf/Data/WysiwygConfigData.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@
2222
<data key="path">cms/wysiwyg/editor</data>
2323
<data key="scope_id">0</data>
2424
<data key="label">Yes</data>
25-
<data key="value">mage/adminhtml/wysiwyg/tiny_mce/tinymce5Adapter</data>
25+
<data key="value">mage/adminhtml/wysiwyg/tiny_mce/tinymceAdapter</data>
2626
</entity>
2727
</entities>

app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection/MediaGallerySection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<element name="UploadImageNew" type="file" selector="#upload_image"/>
2424
<element name="UploadImageSelector" type="file" selector="#fileUploader"/>
2525
<element name="UploadImageWithUploaderId" type="file" selector="#fileUploader + .uppy-Root .uppy-Dashboard-input"/>
26-
<element name="OkBtn" type="button" selector=".tox-dialog__footer button[title='Save']"/>
26+
<element name="OkBtn" type="button" selector=".tox-dialog__footer button[aria-label='Save']"/>
2727
<element name="insertBtn" type="button" selector="#insert"/>
2828
<element name="InsertFile" type="text" selector="#insert_files" timeout="30"/>
2929
<element name="CreateFolder" type="button" selector="#new_folder" timeout="30"/>

app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection/TinyMCESection.xml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@
1616
<element name="InsertVariableBtn" type="button" selector=".scalable.add-variable.plugin"/>
1717
<element name="InsertVariableIcon" type="button" selector="button[aria-label='Insert Variable']"/>
1818
<element name="InsertImageBtn" type="button" selector=".scalable.action-add-image.plugin"/>
19-
<element name="InsertImageIcon" type="button" selector="button[title='Insert/edit image']" timeout="30"/>
20-
<element name="Style" type="button" selector="button[title='Blocks']"/>
21-
<element name="Bold" type="button" selector="button[title='Bold']"/>
22-
<element name="Italic" type="button" selector="button[title='Italic']"/>
23-
<element name="Underline" type="button" selector="button[title='Underline']"/>
24-
<element name="AlignLeft" type="button" selector="button[title='Align left']"/>
25-
<element name="AlignCenter" type="button" selector="button[title='Align center']"/>
26-
<element name="AlignRight" type="button" selector="button[title='Align right']"/>
27-
<element name="Bullet" type="button" selector="div[title='Bullet list']"/>
28-
<element name="Numlist" type="button" selector="div[title='Numbered list']"/>
29-
<element name="InsertLink" type="button" selector="button[title='Insert/edit link']"/>
30-
<element name="InsertTable" type="button" selector="button[title='Table']"/>
31-
<element name="SpecialCharacter" type="button" selector="button[title='Special character']"/>
19+
<element name="InsertImageIcon" type="button" selector="button[aria-label='Insert/edit image']" timeout="30"/>
20+
<element name="Style" type="button" selector="button[aria-label='Block Paragraph']"/>
21+
<element name="Bold" type="button" selector="button[aria-label='Bold']"/>
22+
<element name="Italic" type="button" selector="button[aria-label='Italic']"/>
23+
<element name="Underline" type="button" selector="button[aria-label='Underline']"/>
24+
<element name="AlignLeft" type="button" selector="button[aria-label='Align left']"/>
25+
<element name="AlignCenter" type="button" selector="button[aria-label='Align center']"/>
26+
<element name="AlignRight" type="button" selector="button[aria-label='Align right']"/>
27+
<element name="Bullet" type="button" selector="div[aria-label='Bullet list']"/>
28+
<element name="Numlist" type="button" selector="div[aria-label='Numbered list']"/>
29+
<element name="InsertLink" type="button" selector="button[aria-label='Insert/edit link']"/>
30+
<element name="InsertTable" type="button" selector="button[aria-label='Table']"/>
31+
<element name="SpecialCharacter" type="button" selector="button[aria-label='Special character']"/>
3232
<element name="WidgetButton" type="button" selector="span[class*='magento-widget mceNonEditable']"/>
3333
<element name="EditorContent" type="input" selector="#tinymce"/>
3434
<element name="Content" type="textarea" selector="textarea"/>

app/code/Magento/Cms/etc/adminhtml/di.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
<arguments>
3838
<argument name="adapterOptions" xsi:type="array">
3939
<item name="tinymce" xsi:type="array">
40-
<item name="value" xsi:type="string">mage/adminhtml/wysiwyg/tiny_mce/tinymce5Adapter</item>
41-
<item name="label" xsi:type="string" translatable="true">TinyMCE 5</item>
40+
<item name="value" xsi:type="string">mage/adminhtml/wysiwyg/tiny_mce/tinymceAdapter</item>
41+
<item name="label" xsi:type="string" translatable="true">TinyMCE 7</item>
4242
</item>
4343
</argument>
4444
</arguments>

app/code/Magento/Cms/etc/config.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<cms>
2424
<wysiwyg>
2525
<enabled>enabled</enabled>
26-
<editor>mage/adminhtml/wysiwyg/tiny_mce/tinymce5Adapter</editor>
26+
<editor>mage/adminhtml/wysiwyg/tiny_mce/tinymceAdapter</editor>
2727
<force_valid>0</force_valid>
2828
</wysiwyg>
2929
</cms>

app/code/Magento/Ui/Block/Wysiwyg/ActiveEditor.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818
class ActiveEditor extends \Magento\Framework\View\Element\Template
1919
{
20-
const DEFAULT_EDITOR_PATH = 'mage/adminhtml/wysiwyg/tiny_mce/tinymce5Adapter';
20+
public const DEFAULT_EDITOR_PATH = 'mage/adminhtml/wysiwyg/tiny_mce/tinymceAdapter';
2121

2222
/**
2323
* @var ScopeConfigInterface

app/code/Magento/Ui/etc/config.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
</dev>
1616
<cms>
1717
<wysiwyg>
18-
<editor_version>mage/adminhtml/wysiwyg/tiny_mce/tinymce5Adapter</editor_version>
18+
<editor_version>mage/adminhtml/wysiwyg/tiny_mce/tinymceAdapter</editor_version>
1919
</wysiwyg>
2020
</cms>
2121
</default>

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

Lines changed: 3 additions & 3 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,8 +28,8 @@ 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',
32-
wysiwygAdapter: 'mage/adminhtml/wysiwyg/tiny_mce/tinymce5Adapter'
31+
tinymce: 'tiny_mce_7/tinymce.min',
32+
wysiwygAdapter: 'mage/adminhtml/wysiwyg/tiny_mce/tinymceAdapter'
3333
}
3434
}
3535
};

dev/tests/integration/_files/Magento/TestModuleWysiwygConfig/view/adminhtml/web/wysiwyg/tinymceTestAdapter.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@
33
* See COPYING.txt for license details.
44
*/
55

6-
/* global popups, tinyMceEditors, MediabrowserUtility, Base64 */
76
/* eslint-disable strict */
87
define([
9-
'mage/adminhtml/wysiwyg/tiny_mce/tinymce5Adapter'
8+
'mage/adminhtml/wysiwyg/tiny_mce/tinymceAdapter'
109
], function (tinyMCE) {
1110
'use strict';
1211

0 commit comments

Comments
 (0)