Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: magento/magento2-page-builder
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 300cae899457da335e3ccb94edf94b8b041ec5e9
Choose a base ref
..
head repository: magento/magento2-page-builder
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: fab562f689d587145502b0f99dcd62fa90f61c3d
Choose a head ref
2 changes: 1 addition & 1 deletion app/code/Magento/PageBuilder/Model/Wysiwyg/DefaultConfigProvider.php
View file
Original file line number Diff line number Diff line change
@@ -42,7 +42,7 @@ public function getConfig(\Magento\Framework\DataObject $config): \Magento\Frame
$config->addData(
[
'tinymce' => [
'toolbar' => 'undo redo | styleselect | fontsizeselect | lineheight | forecolor backcolor ' .
'toolbar' => 'undo redo | styles | fontsizeselect | lineheight | forecolor backcolor ' .
'| bold italic underline | alignleft aligncenter alignright | numlist bullist ' .
'| link image table charmap',

4 changes: 2 additions & 2 deletions ...PageBuilder/Test/Mftf/Section/PageBuilderWYSIWYGSection/WYSIWYGInsertLinkModalSection.xml
View file
Original file line number Diff line number Diff line change
@@ -12,11 +12,11 @@
<element name="title" type="input" selector="//div[@aria-label='Insert link']//div[contains(@id,'-title') and .='Insert link']"/>
<element name="xButton" type="button" selector="[aria-label='Insert link'] button.mce-close"/>
<element name="urlInput" type="input" selector="//div[@class='tox-dialog']//label[text()='URL']/..//input"/>
<element name="browseMediaGalleryButton" type="button" selector="//div[@class='tox-dialog']//label[text()='URL']//..//button[@title='URL']"/>
<element name="browseMediaGalleryButton" type="button" selector="//div[@class='tox-dialog']//label[text()='URL']//..//button[@aria-label='Browse links']"/>
<element name="textToDisplayInput" type="input" selector="//div[@class='tox-dialog']//label[text()='Text to display']/..//input"/>
<element name="titleInput" type="input" selector="//div[@class='tox-dialog']//label[text()='Title']/..//input"/>
<element name="targetInput" type="input" selector="button[title='Open link in...']"/>
<element name="okButton" type="button" selector="//div[@class='tox-dialog']//button[@title='Save']"/>
<element name="okButton" type="button" selector="//div[@class='tox-dialog']//button[@aria-label='Save']"/>
<element name="cancelButton" type="button" selector="//div[@aria-label='Insert link']//button//span[.='Cancel']"/>
</section>
</sections>
2 changes: 1 addition & 1 deletion ...Builder/Test/Mftf/Section/PageBuilderWYSIWYGSection/WYSIWYGOnPageBuilderInlineSection.xml
View file
Original file line number Diff line number Diff line change
@@ -43,7 +43,7 @@
<element name="specialCharacter" type="button" selector=".tox-tinymce-inline button[aria-label='Special character']"/>
<element name="insertWidget" type="button" selector=".tox-tinymce-inline button[aria-label='Insert Widget']"/>
<element name="insertVariable" type="button" selector=".tox-tinymce-inline button[aria-label='Insert Variable']"/>
<element name="imageSelectorBrowse" type="button" selector="button[title='Source']"/>
<element name="imageSelectorBrowse" type="button" selector="button[aria-label='Browse files']"/>
<element name="imageSelectorOk" type="button" selector="//div[contains(@aria-label, 'Insert/edit image')]//span[contains(@class, 'mce-txt')][text()='Ok']"/>
<element name="formatOption" type="text" parameterized="true" selector="div[title='{{label}}']"/>
<element name="HeadSelector" type="text" selector="div[title='Headings']"/>
2 changes: 1 addition & 1 deletion app/code/Magento/PageBuilder/Test/Mftf/Section/TinyMCESection.xml
View file
Original file line number Diff line number Diff line change
@@ -8,6 +8,6 @@
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
<section name="TinyMCESection">
<element name="Style" type="button" selector="button[title='Formats']"/>
<element name="Style" type="button" selector="button[aria-label='Format Paragraph']"/>
</section>
</sections>
6 changes: 3 additions & 3 deletions app/code/Magento/PageBuilder/etc/adminhtml/di.xml
View file
Original file line number Diff line number Diff line change
@@ -587,14 +587,14 @@
<type name="Magento\PageBuilder\Model\Wysiwyg\InlineEditingSupportedAdapterList">
<arguments>
<argument name="wysiwygAdaptersSupportingInlineEditing" xsi:type="array">
<item name="mage/adminhtml/wysiwyg/tiny_mce/tinymce5Adapter" xsi:type="boolean">true</item>
<item name="mage/adminhtml/wysiwyg/tiny_mce/tinymceAdapter" xsi:type="boolean">true</item>
</argument>
</arguments>
</type>
<type name="Magento\PageBuilder\Model\Config\ContentType\AdditionalData\Provider\Wysiwyg\Config">
<arguments>
<argument name="editors" xsi:type="array">
<item name="mage/adminhtml/wysiwyg/tiny_mce/tinymce5Adapter" xsi:type="array">
<item name="mage/adminhtml/wysiwyg/tiny_mce/tinymceAdapter" xsi:type="array">
<item name="component" xsi:type="string">Magento_PageBuilder/js/wysiwyg/tinymce</item>
<item name="component_initializers" xsi:type="array">
<item name="text" xsi:type="string">Magento_PageBuilder/js/content-type/text/wysiwyg/tinymce/component-initializer</item>
@@ -618,7 +618,7 @@
<virtualType name="Magento\PageBuilder\Model\Config\ContentType\AdditionalData\Provider\Wysiwyg\BannerConfig" type="Magento\PageBuilder\Model\Config\ContentType\AdditionalData\Provider\Wysiwyg\Config">
<arguments>
<argument name="editors" xsi:type="array">
<item name="mage/adminhtml/wysiwyg/tiny_mce/tinymce5Adapter" xsi:type="array">
<item name="mage/adminhtml/wysiwyg/tiny_mce/tinymceAdapter" xsi:type="array">
<item name="parentSelectorsToUnderlay" xsi:type="null"/>
</item>
</argument>