From e3d67ea7fa7551c15cccd025d83d806458005d00 Mon Sep 17 00:00:00 2001
From: Oleh Posyniak <oposyniak@magento.com>
Date: Wed, 12 Oct 2016 10:25:17 +0300
Subject: [PATCH] MAGETWO-57796: [GitHub] Inserted image in product description
got broken on front end #6138
---
.../Catalog/Block/Adminhtml/Helper/Form/Wysiwyg/Content.php | 6 ++++++
.../Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php | 5 ++++-
app/code/Magento/Cms/Model/Wysiwyg/Config.php | 1 -
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Helper/Form/Wysiwyg/Content.php b/app/code/Magento/Catalog/Block/Adminhtml/Helper/Form/Wysiwyg/Content.php
index d5488ecc5d0..ac8cb91222f 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Helper/Form/Wysiwyg/Content.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Helper/Form/Wysiwyg/Content.php
@@ -14,6 +14,12 @@ namespace Magento\Catalog\Block\Adminhtml\Helper\Form\Wysiwyg;
use Magento\Backend\Block\Widget\Form;
use Magento\Backend\Block\Widget\Form\Generic;
+/**
+ * Class Content
+ *
+ * @deprecated
+ * @see \Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Eav
+ */
class Content extends Generic
{
/**
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php
index 1419c17e11b..e1680ab5a40 100755
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php
@@ -754,7 +754,10 @@ class Eav extends AbstractModifier
$meta['arguments']['data']['config']['wysiwyg'] = true;
$meta['arguments']['data']['config']['wysiwygConfigData'] = [
'add_variables' => false,
- 'add_widgets' => false
+ 'add_widgets' => false,
+ 'add_directives' => true,
+ 'use_container' => true,
+ 'container_class' => 'hor-scroll',
];
return $meta;
diff --git a/app/code/Magento/Cms/Model/Wysiwyg/Config.php b/app/code/Magento/Cms/Model/Wysiwyg/Config.php
index a8cd1eb22f6..44d512e8f45 100644
--- a/app/code/Magento/Cms/Model/Wysiwyg/Config.php
+++ b/app/code/Magento/Cms/Model/Wysiwyg/Config.php
@@ -180,7 +180,6 @@ class Config extends \Magento\Framework\DataObject implements ConfigInterface
'width' => '100%',
'height' => '500px',
'plugins' => [],
- 'add_directives' => true,
]
);
--
GitLab