Skip to content

Commit 2b809d4

Browse files
authored
Merge pull request #360 from magento-gl/Hammer-Plateform-Health-17July24
[Hammer] Platform-Health-Scope-17july24
2 parents 2de0d7d + b662451 commit 2b809d4

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public function getConfig(\Magento\Framework\DataObject $config): \Magento\Frame
4242
$config->addData(
4343
[
4444
'tinymce' => [
45-
'toolbar' => 'undo redo | styleselect | fontsizeselect | lineheight | forecolor backcolor ' .
45+
'toolbar' => 'undo redo | styles | fontsizeselect | lineheight | forecolor backcolor ' .
4646
'| bold italic underline | alignleft aligncenter alignright | numlist bullist ' .
4747
'| link image table charmap',
4848

app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderWYSIWYGSection/WYSIWYGInsertLinkModalSection.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
<element name="title" type="input" selector="//div[@aria-label='Insert link']//div[contains(@id,'-title') and .='Insert link']"/>
1313
<element name="xButton" type="button" selector="[aria-label='Insert link'] button.mce-close"/>
1414
<element name="urlInput" type="input" selector="//div[@class='tox-dialog']//label[text()='URL']/..//input"/>
15-
<element name="browseMediaGalleryButton" type="button" selector="//div[@class='tox-dialog']//label[text()='URL']//..//button[@title='URL']"/>
15+
<element name="browseMediaGalleryButton" type="button" selector="//div[@class='tox-dialog']//label[text()='URL']//..//button[@aria-label='Browse links']"/>
1616
<element name="textToDisplayInput" type="input" selector="//div[@class='tox-dialog']//label[text()='Text to display']/..//input"/>
1717
<element name="titleInput" type="input" selector="//div[@class='tox-dialog']//label[text()='Title']/..//input"/>
1818
<element name="targetInput" type="input" selector="button[title='Open link in...']"/>
19-
<element name="okButton" type="button" selector="//div[@class='tox-dialog']//button[@title='Save']"/>
19+
<element name="okButton" type="button" selector="//div[@class='tox-dialog']//button[@aria-label='Save']"/>
2020
<element name="cancelButton" type="button" selector="//div[@aria-label='Insert link']//button//span[.='Cancel']"/>
2121
</section>
2222
</sections>

app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderWYSIWYGSection/WYSIWYGOnPageBuilderInlineSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<element name="specialCharacter" type="button" selector=".tox-tinymce-inline button[aria-label='Special character']"/>
4444
<element name="insertWidget" type="button" selector=".tox-tinymce-inline button[aria-label='Insert Widget']"/>
4545
<element name="insertVariable" type="button" selector=".tox-tinymce-inline button[aria-label='Insert Variable']"/>
46-
<element name="imageSelectorBrowse" type="button" selector="button[title='Source']"/>
46+
<element name="imageSelectorBrowse" type="button" selector="button[aria-label='Browse files']"/>
4747
<element name="imageSelectorOk" type="button" selector="//div[contains(@aria-label, 'Insert/edit image')]//span[contains(@class, 'mce-txt')][text()='Ok']"/>
4848
<element name="formatOption" type="text" parameterized="true" selector="div[title='{{label}}']"/>
4949
<element name="HeadSelector" type="text" selector="div[title='Headings']"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1010
<section name="TinyMCESection">
11-
<element name="Style" type="button" selector="button[title='Formats']"/>
11+
<element name="Style" type="button" selector="button[aria-label='Format Paragraph']"/>
1212
</section>
1313
</sections>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -587,14 +587,14 @@
587587
<type name="Magento\PageBuilder\Model\Wysiwyg\InlineEditingSupportedAdapterList">
588588
<arguments>
589589
<argument name="wysiwygAdaptersSupportingInlineEditing" xsi:type="array">
590-
<item name="mage/adminhtml/wysiwyg/tiny_mce/tinymce5Adapter" xsi:type="boolean">true</item>
590+
<item name="mage/adminhtml/wysiwyg/tiny_mce/tinymceAdapter" xsi:type="boolean">true</item>
591591
</argument>
592592
</arguments>
593593
</type>
594594
<type name="Magento\PageBuilder\Model\Config\ContentType\AdditionalData\Provider\Wysiwyg\Config">
595595
<arguments>
596596
<argument name="editors" xsi:type="array">
597-
<item name="mage/adminhtml/wysiwyg/tiny_mce/tinymce5Adapter" xsi:type="array">
597+
<item name="mage/adminhtml/wysiwyg/tiny_mce/tinymceAdapter" xsi:type="array">
598598
<item name="component" xsi:type="string">Magento_PageBuilder/js/wysiwyg/tinymce</item>
599599
<item name="component_initializers" xsi:type="array">
600600
<item name="text" xsi:type="string">Magento_PageBuilder/js/content-type/text/wysiwyg/tinymce/component-initializer</item>
@@ -618,7 +618,7 @@
618618
<virtualType name="Magento\PageBuilder\Model\Config\ContentType\AdditionalData\Provider\Wysiwyg\BannerConfig" type="Magento\PageBuilder\Model\Config\ContentType\AdditionalData\Provider\Wysiwyg\Config">
619619
<arguments>
620620
<argument name="editors" xsi:type="array">
621-
<item name="mage/adminhtml/wysiwyg/tiny_mce/tinymce5Adapter" xsi:type="array">
621+
<item name="mage/adminhtml/wysiwyg/tiny_mce/tinymceAdapter" xsi:type="array">
622622
<item name="parentSelectorsToUnderlay" xsi:type="null"/>
623623
</item>
624624
</argument>

0 commit comments

Comments
 (0)