Skip to content

Commit a68d263

Browse files
davemacaulaydavemacaulay
committed
Merge branch 'PB-225' into PB-76
2 parents 9b43862 + a01127e commit a68d263

File tree

4 files changed

+54
-30
lines changed

4 files changed

+54
-30
lines changed

‎app/code/Magento/PageBuilder/Block/Adminhtml/Stage/Render.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717

1818
/**
1919
* Class Render
20+
*
21+
* @api
2022
*/
2123
class Render extends Template
2224
{

‎app/code/Magento/PageBuilder/Controller/Adminhtml/Stage/Render.php

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@
77

88
namespace Magento\PageBuilder\Controller\Adminhtml\Stage;
99

10+
use Magento\Backend\App\Action\Context;
1011
use Magento\Framework\App\Action\HttpGetActionInterface;
11-
use Magento\RequireJs\Block\Html\Head\Config;
12+
use Magento\Framework\View\Result\PageFactory;
1213

1314
/**
1415
* Class Render
@@ -20,30 +21,31 @@ class Render extends \Magento\Backend\App\Action implements HttpGetActionInterfa
2021
const ADMIN_RESOURCE = 'Magento_Backend::content';
2122

2223
/**
23-
* Render the RequireJS and Page Builder render blocks without any additional layout
24+
* @var \Magento\Framework\View\Result\PageFactory
25+
*/
26+
private $pageFactory;
27+
28+
/**
29+
* Render constructor.
30+
*
31+
* @param Context $context
32+
* @param PageFactory $pageFactory
33+
*/
34+
public function __construct(
35+
Context $context,
36+
PageFactory $pageFactory
37+
) {
38+
$this->pageFactory = $pageFactory;
39+
return parent::__construct($context);
40+
}
41+
42+
/**
43+
* Render route
2444
*
25-
* @return void
45+
* @return \Magento\Framework\App\ResponseInterface|\Magento\Framework\Controller\ResultInterface|mixed
2646
*/
2747
public function execute()
2848
{
29-
$layout = $this->_view->getLayout();
30-
$requireJs = $layout->createBlock(
31-
\Magento\Backend\Block\Page\RequireJs::class,
32-
'require.js'
33-
);
34-
$requireJs->setTemplate('Magento_Backend::page/js/require_js.phtml');
35-
/* @var \Magento\PageBuilder\Block\Adminhtml\Stage\Render $renderBlock */
36-
$renderBlock = $layout->createBlock(
37-
\Magento\PageBuilder\Block\Adminhtml\Stage\Render::class,
38-
'stage_render'
39-
);
40-
$renderBlock->setTemplate('Magento_PageBuilder::stage/render.phtml');
41-
$babelPolyfill = $layout->createBlock(
42-
\Magento\PageBuilder\Block\Adminhtml\Html\Head\BabelPolyfill::class,
43-
'pagebuilder.babel.polyfill'
44-
);
45-
$babelPolyfill->setTemplate('Magento_PageBuilder::html/head/babel_polyfill.phtml');
46-
$this->getResponse()->setBody($requireJs->toHtml() . $babelPolyfill->toHtml() . $renderBlock->toHtml());
47-
$this->getResponse()->sendResponse();
49+
return $this->pageFactory->create();
4850
}
4951
}

‎app/code/Magento/PageBuilder/view/adminhtml/layout/pagebuilder_stage_render.xml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?xml version="1.0"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="admin-1column" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
9+
<head>
10+
<remove src="extjs/resources/css/ext-all.css"/>
11+
<remove src="extjs/resources/css/ytheme-magento.css"/>
12+
<remove src="jquery/jstree/themes/default/style.css"/>
13+
<remove src="css/styles-old.css"/>
14+
<remove src="css/styles.css"/>
15+
</head>
16+
<body>
17+
<referenceContainer name="backend.page" remove="true"/>
18+
<referenceContainer name="menu.wrapper" remove="true"/>
19+
<referenceContainer name="root">
20+
<block name="stage_render" class="Magento\PageBuilder\Block\Adminhtml\Stage\Render" template="Magento_PageBuilder::stage/render.phtml" />
21+
<block name="pagebuilder.babel.polyfill" class="Magento\PageBuilder\Block\Adminhtml\Html\Head\BabelPolyfill" template="Magento_PageBuilder::html/head/babel_polyfill.phtml" />
22+
<block class="Magento\RequireJs\Block\Html\Head\Config" name="requirejs-config"/>
23+
</referenceContainer>
24+
</body>
25+
</page>

‎app/code/Magento/PageBuilder/view/adminhtml/templates/stage/render.phtml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,6 @@
66

77
/** @var \Magento\PageBuilder\Block\Adminhtml\Stage\Render $block */
88
?>
9-
<script src="<?= $block->escapeUrl($block->getRequireJsUrl()); ?>"></script>
10-
<?php if ($block->getRequireJsMinUrl()) : ?>
11-
<script src="<?= $block->escapeUrl($block->getRequireJsMinUrl()); ?>"></script>
12-
<?php endif; ?>
13-
<script src="<?= $block->escapeUrl($block->getRequireJsConfigUrl()); ?>"></script>
149
<script>
1510
<?php
1611
/**
@@ -22,9 +17,9 @@
2217
'map': {
2318
'*': {
2419
'text': 'Magento_PageBuilder/js/master-format/render/requirejs/text',
25-
'Magento_PageBuilder/js/events': 'Magento_PageBuilder/js/master-format/render/events',
20+
'Magento_PageBuilder/js/events': 'Magento_PageBuilder/js/master-format/render/events'
2621
}
27-
},
22+
}
2823
});
2924

3025
<?php
@@ -50,4 +45,4 @@
5045
listen(<?= /* @noEscape */ $block->getPageBuilderConfig(); ?>);
5146
});
5247
</script>
53-
<div>Page Builder Render Frame</div>
48+
<div>Page Builder Render Frame</div>

0 commit comments

Comments
 (0)