Merge pull request #6266 from magento-obsessive-owls/imported-magento-magento2-30565

omiroshnichenko · web-flow · commit 68c903f5623b · 2020-10-21T23:30:46.000-05:00
[Imported] magento/magento2-page-builder#558: Developer can style content types …
diff --git a/app/code/Magento/Cms/Test/Mftf/Section/CmsNewBlockBlockActionsSection/BlockContentSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewBlockBlockActionsSection/BlockContentSection.xml
@@ -9,7 +9,7 @@
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="BlockContentSection">
         <element name="TextArea" type="input" selector="#cms_block_form_content"/>
-        <element name="image" type="file" selector="#tinymce img"/>
+        <element name="image" type="file" selector=".mce-content-body img"/>
         <element name="contentIframe" type="iframe" selector="cms_block_form_content_ifr"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Theme/view/frontend/layout/default.xml b/app/code/Magento/Theme/view/frontend/layout/default.xml
@@ -8,6 +8,7 @@
 <page layout="3columns" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <update handle="default_head_blocks"/>
     <body>
+        <attribute name="id" value="html-body"/>
         <block name="require.js" class="Magento\Framework\View\Element\Template" template="Magento_Theme::page/js/require_js.phtml" />
         <referenceContainer name="after.body.start">
             <block class="Magento\RequireJs\Block\Html\Head\Config" name="requirejs-config"/>
diff --git a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js
@@ -205,6 +205,7 @@ define([
                 plugins: this.config.tinymce4.plugins,
                 toolbar: this.config.tinymce4.toolbar,
                 adapter: this,
+                'body_id': 'html-body',
 
                 /**
                  * @param {Object} editor
