[Magento Community Engineering] Community Contributions - 2.3-develop

 - merged latest code from mainline branch

Author: magento-engcom-team

app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryBasicFieldSection.xml

@@ -49,7 +49,7 @@
     </section>
     <section name="CatalogWYSIWYGSection">
         <element name="ShowHideBtn" type="button" selector="#togglecategory_form_description"/>
-        <element name="TinyMCE4" type="text" selector=".mce-branding-powered-by"/>
+        <element name="TinyMCE4" type="text" selector=".mce-branding"/>
         <element name="Style" type="button" selector=".mce-txt" />
         <element name="Bold" type="button" selector=".mce-i-bold" />
         <element name="Italic" type="button" selector=".mce-i-italic" />

app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateProductAttributeSection.xml

@@ -20,7 +20,7 @@
         <element name="Save" type="button" selector="#save" timeout="30"/>
         <element name="DeleteAttribute" type="button" selector="#delete" timeout="30"/>
         <element name="SaveAndEdit" type="button" selector="#save_and_edit_button" timeout="30"/>
-        <element name="TinyMCE4" type="button" selector="//span[text()='Default Value']/parent::label/following-sibling::div//div[@class='mce-branding-powered-by']"/>
+        <element name="TinyMCE4" type="button" selector="//span[text()='Default Value']/parent::label/following-sibling::div//*[contains(@class,'mce-branding')]"/>
         <element name="checkIfTabOpen" selector="//div[@id='advanced_fieldset-wrapper' and not(contains(@class,'opened'))]" type="button"/>
         <element name="useInLayeredNavigation" type="select" selector="#is_filterable"/>
         <element name="addSwatch" type="button" selector="#add_new_swatch_text_option_button"/>

app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml

@@ -121,10 +121,10 @@
         <element name="InsertImageIcon" type="button" selector="//div[contains(@id, '{{var1}}')]//i[@class='mce-ico mce-i-image']" parameterized="true"/>
         <element name="InsertTable" type="button" selector="//div[contains(@id, '{{var1}}')]//i[@class='mce-ico mce-i-table']" parameterized="true"/>
         <element name="SpecialCharacter" type="button" selector="//div[contains(@id, '{{var1}}')]//i[@class='mce-ico mce-i-charmap']" parameterized="true"/>
-        <element name="TinyMCE4" type="text" selector="//div[contains(@id, '{{var1}}')]//div[@class='mce-branding-powered-by']" parameterized="true"/>
+        <element name="TinyMCE4" type="text" selector="//div[contains(@id, '{{var1}}')]//*[contains(@class,'mce-branding')]" parameterized="true"/>
     </section>
     <section name="ProductDescriptionWYSIWYGToolbarSection">
-        <element name="TinyMCE4" type ="button" selector="//div[@id='editorproduct_form_description']//div[@class='mce-branding-powered-by']" />
+        <element name="TinyMCE4" type ="button" selector="//div[@id='editorproduct_form_description']//*[contains(@class,'mce-branding')]" />
         <element name="showHideBtn" type="button" selector="#toggleproduct_form_description"/>
         <element name="InsertImageBtn" type="button" selector="#buttonsproduct_form_description > .scalable.action-add-image.plugin" />
         <element name="Style" type="button" selector="//div[@id='editorproduct_form_description']//span[text()='Paragraph']" />
@@ -162,7 +162,7 @@
         <element name="confirmDelete" type="button" selector=".action-primary.action-accept" />
     </section>
     <section name="ProductShortDescriptionWYSIWYGToolbarSection">
-        <element name="TinyMCE4" type ="button" selector="//div[@id='editorproduct_form_short_description']//div[@class='mce-branding-powered-by']" />
+        <element name="TinyMCE4" type ="button" selector="//div[@id='editorproduct_form_short_description']//*[contains(@class,'mce-branding')]" />
         <element name="InsertImageBtn" type="button" selector="#buttonsproduct_form_short_description > .scalable.action-add-image.plugin" />
         <element name="showHideBtn" type="button" selector="#toggleproduct_form_short_description"/>
         <element name="Style" type="button" selector="//div[@id='editorproduct_form_short_description']//span[text()='Paragraph']" />

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

@@ -11,7 +11,7 @@
     <section name="TinyMCESection">
         <element name="checkIfContentTabOpen" type="button" selector="//span[text()='Content']/parent::strong/parent::*[@data-state-collapsible='closed']"/>
         <element name="CheckIfTabExpand" type="button" selector="//div[@data-state-collapsible='closed']//span[text()='Content']"/>
-        <element name="TinyMCE4" type="text" selector=".mce-branding-powered-by" />
+        <element name="TinyMCE4" type="text" selector=".mce-branding" />
         <element name="InsertWidgetBtn" type="button" selector=".action-add-widget"/>
         <element name="InsertWidgetIcon" type="button" selector="div[aria-label='Insert Widget']"/>
         <element name="InsertVariableBtn" type="button" selector=".scalable.add-variable.plugin"/>

app/code/Magento/Newsletter/Test/Mftf/Section/NewsletterTemplateSection.xml

@@ -18,7 +18,7 @@
     </section>
     <section name="NewsletterWYSIWYGSection">
         <element name="TextArea" type="text" selector="#text" />
-        <element name="TinyMCE4" type="text" selector=".mce-branding-powered-by" />
+        <element name="TinyMCE4" type="text" selector=".mce-branding" />
         <element name="ShowHideBtn" type="button" selector="#toggletext" timeout="60"/>
         <element name="InsertWidgetBtn" type="button" selector=".action-add-widget"/>
         <element name="InsertWidgetIcon" type="button" selector="div[aria-label='Insert Widget']"/>

lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js

@@ -193,6 +193,7 @@ define([
             settings = {
                 selector: '#' + this.getId(),
                 theme: 'modern',
+                skin: 'magento',
                 'entity_encoding': 'raw',
                 'convert_urls': false,
                 'content_css': this.config.tinymce4['content_css'],
@@ -263,6 +264,10 @@ define([
                 }
             };
 
+            if (this.config.skin) {
+                settings.skin = this.config.skin;
+            }
+
             if (this.config.baseStaticUrl && this.config.baseStaticDefaultUrl) {
                 settings['document_base_url'] = this.config.baseStaticUrl;
             }

lib/web/mage/adminhtml/wysiwyg/widget.js

@@ -468,6 +468,7 @@ define([
                                 if (activeNode) {
                                     editor.selection.select(activeNode);
                                     editor.selection.setContent(transport.responseText);
+                                    editor.fire('Change');
                                 } else if (this.bMark) {
                                     editor.selection.moveToBookmark(this.bMark);
                                 }