diff -Nuar a/vendor/magento/module-page-builder/Controller/Adminhtml/Stage/Render.php b/vendor/magento/module-page-builder/Controller/Adminhtml/Stage/Render.php index c11418a4d..72436bcab 100644 --- a/vendor/magento/module-page-builder/Controller/Adminhtml/Stage/Render.php +++ b/vendor/magento/module-page-builder/Controller/Adminhtml/Stage/Render.php @@ -7,8 +7,9 @@ namespace Magento\PageBuilder\Controller\Adminhtml\Stage; +use Magento\Backend\App\Action\Context; use Magento\Framework\App\Action\HttpGetActionInterface; -use Magento\RequireJs\Block\Html\Head\Config; +use Magento\Framework\View\Result\PageFactory; /** * Class Render @@ -20,30 +21,31 @@ class Render extends \Magento\Backend\App\Action implements HttpGetActionInterfa const ADMIN_RESOURCE = 'Magento_Backend::content'; /** - * Render the RequireJS and Page Builder render blocks without any additional layout + * @var \Magento\Framework\View\Result\PageFactory + */ + protected $pageFactory; + + /** + * Render constructor. + * + * @param Context $context + * @param PageFactory $pageFactory + */ + public function __construct( + Context $context, + PageFactory $pageFactory + ) { + $this->pageFactory = $pageFactory; + return parent::__construct($context); + } + + /** + * Render route * - * @return void + * @return \Magento\Framework\App\ResponseInterface|\Magento\Framework\Controller\ResultInterface|mixed */ public function execute() { - $layout = $this->_view->getLayout(); - $requireJs = $layout->createBlock( - \Magento\Backend\Block\Page\RequireJs::class, - 'require.js' - ); - $requireJs->setTemplate('Magento_Backend::page/js/require_js.phtml'); - /* @var \Magento\PageBuilder\Block\Adminhtml\Stage\Render $renderBlock */ - $renderBlock = $layout->createBlock( - \Magento\PageBuilder\Block\Adminhtml\Stage\Render::class, - 'stage_render' - ); - $renderBlock->setTemplate('Magento_PageBuilder::stage/render.phtml'); - $babelPolyfill = $layout->createBlock( - \Magento\PageBuilder\Block\Adminhtml\Html\Head\BabelPolyfill::class, - 'pagebuilder.babel.polyfill' - ); - $babelPolyfill->setTemplate('Magento_PageBuilder::html/head/babel_polyfill.phtml'); - $this->getResponse()->setBody($requireJs->toHtml() . $babelPolyfill->toHtml() . $renderBlock->toHtml()); - $this->getResponse()->sendResponse(); + return $this->pageFactory->create(); } } diff -Nuar a/vendor/magento/module-page-builder/view/adminhtml/layout/pagebuilder_stage_render.xml b/vendor/magento/module-page-builder/view/adminhtml/layout/pagebuilder_stage_render.xml new file mode 100644 index 000000000..6a95e8e87 --- /dev/null +++ b/vendor/magento/module-page-builder/view/adminhtml/layout/pagebuilder_stage_render.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + diff -Nuar a/vendor/magento/module-page-builder/view/adminhtml/templates/stage/render.phtml b/vendor/magento/module-page-builder/view/adminhtml/templates/stage/render.phtml index c1280e3ff..cd3c853b2 100644 --- a/vendor/magento/module-page-builder/view/adminhtml/templates/stage/render.phtml +++ b/vendor/magento/module-page-builder/view/adminhtml/templates/stage/render.phtml @@ -6,8 +6,6 @@ /** @var \Magento\PageBuilder\Block\Adminhtml\Stage\Render $block */ ?> - - -
Page Builder Render Frame
\ No newline at end of file +
Page Builder Render Frame