Skip to content

Commit b34b29d

Browse files
author
Hwashiang Yu
committed
MC-34573: Update TinyMCE
- Use comment deprecation for selectors due to known issue with mftf deprecatedEntityUsage static test - Fixed static test failures
1 parent f5823e5 commit b34b29d

File tree

4 files changed

+10
-6
lines changed

4 files changed

+10
-6
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
<element name="imageSelected" type="text" selector="//small[text()='{{var1}}']/parent::*[@class='filecnt selected']" parameterized="true"/>
1818
<element name="ImageSource" type="input" selector=".mce-combobox.mce-abs-layout-item.mce-last.mce-has-open"/>
1919
<element name="ImageDescription" type="input" selector=".mce-textbox.mce-abs-layout-item.mce-last"/>
20-
<element name="ImageDescriptionTinyMCE3" type="input" selector="#alt" deprecated="New element was introduced. Please use 'ImageDescriptionTinyMCE4'"/>
20+
<!-- Deprecated New element was introduced. Please use 'ImageDescriptionTinyMCE4'-->
21+
<element name="ImageDescriptionTinyMCE3" type="input" selector="#alt"/>
2122
<element name="ImageDescriptionTinyMCE4" type="input" selector="#alt" />
2223
<element name="Height" type="input" selector=".mce-textbox.mce-abs-layout-item.mce-first"/>
2324
<element name="UploadImage" type="file" selector=".fileupload"/>

app/code/Magento/Tinymce3/Test/Mftf/Section/AdminTinymce3FileldsSection/NewsletterWYSIWYGSection.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
10-
<section name="NewsletterWYSIWYGSection" deprecated="This version of TinyMCE is no longer supported">
11-
<element name="TinyMCE3" type="text" selector="#cms_page_form_content_tbl"/>
10+
<section name="NewsletterWYSIWYGSection">
11+
<element name="TinyMCE3" type="text" selector="#cms_page_form_content_tbl" deprecated="This version of TinyMCE is no longer supported"/>
1212
</section>
1313
</sections>

app/code/Magento/Tinymce3/Test/Mftf/Section/AdminTinymce3FileldsSection/TinyMCESection.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@
77
-->
88
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
10-
<section name="TinyMCESection" deprecated="This version of TinyMCE is no longer supported">
10+
<section name="TinyMCESection">
11+
<!-- Deprecated this version of TinyMCE is no longer supported -->
1112
<element name="TinyMCE3" type="text" selector="#cms_page_form_content_tbl"/>
13+
<!-- Deprecated this version of TinyMCE is no longer supported -->
1214
<element name="InsertImageBtnTinyMCE3" type="button" selector="#cms_page_form_content_image"/>
1315
</section>
1416
</sections>

app/code/Magento/Ui/DataProvider/Modifier/WysiwygModifierInterface.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,16 @@
1111
interface WysiwygModifierInterface
1212
{
1313
/**
14-
* Provide editor name
15-
* For example tmce4
14+
* Provide editor name for example tmce4
1615
*
1716
* @return array
1817
*/
1918
public function getEditorName();
2019

2120
/**
21+
* Modifies the meta
2222
* @param array $meta
23+
*
2324
* @return array
2425
*/
2526
public function modifyMeta(array $meta);

0 commit comments

Comments
 (0)