Skip to content

Commit 90e68e7

Browse files
committed
MC-15981: Page Builder Render
1 parent ecdafdd commit 90e68e7

File tree

18 files changed

+108
-164
lines changed

18 files changed

+108
-164
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class Render extends \Magento\Backend\App\Action implements HttpGetActionInterfa
2020
const ADMIN_RESOURCE = 'Magento_Backend::content';
2121

2222
/**
23-
* Preview transactional email action
23+
* Render the RequireJS and Page Builder render blocks without any additional layout
2424
*
2525
* @return void
2626
*/

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<script>
1010
<?php
1111
/**
12-
* Shim localStorage always within the iframe to ensure any calls from Magento API's do not fail due to same origin
12+
* Shim localStorage within the iframe to ensure any calls from Magento API's do not fail due to same origin
1313
* policies.
1414
*/
1515
?>
@@ -50,7 +50,7 @@
5050
require.config({
5151
'map': {
5252
'*': {
53-
'text': 'Magento_PageBuilder/js/render/requirejs/text',
53+
'text': 'Magento_PageBuilder/js/master-format/render/requirejs/text',
5454
}
5555
},
5656
});
@@ -59,7 +59,8 @@
5959
/**
6060
* To be able to override the text plugin we need the Magento template engine to be used, as the template engine
6161
* within lib has a dependency on the text! plugin we need to ensure we set the template engine before the
62-
* dependency blocks us.
62+
* dependency blocks us. If we try to just override using the RequireJS config above our !text plugin will never
63+
* get overridden as our template engine cannot load.
6364
*/
6465
?>
6566
require([
@@ -73,7 +74,7 @@
7374
});
7475
</script>
7576
<script>
76-
require(['Magento_PageBuilder/js/render/frame'], function (listen) {
77+
require(['Magento_PageBuilder/js/master-format/render/frame'], function (listen) {
7778
listen(<?= /* @noEscape */ $block->getPageBuilderConfig(); ?>);
7879
});
7980
</script>

app/code/Magento/PageBuilder/view/adminhtml/web/js/master-format/render.js

Lines changed: 4 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/code/Magento/PageBuilder/view/adminhtml/web/js/render/frame.js renamed to app/code/Magento/PageBuilder/view/adminhtml/web/js/master-format/render/frame.js

Lines changed: 11 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/code/Magento/PageBuilder/view/adminhtml/web/js/render/requirejs/text.js renamed to app/code/Magento/PageBuilder/view/adminhtml/web/js/master-format/render/requirejs/text.js

Lines changed: 6 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/code/Magento/PageBuilder/view/adminhtml/web/js/render/content-type.js

Lines changed: 0 additions & 33 deletions
This file was deleted.

app/code/Magento/PageBuilder/view/adminhtml/web/js/render/content.js

Lines changed: 0 additions & 40 deletions
This file was deleted.

app/code/Magento/PageBuilder/view/adminhtml/web/js/render/render-content-type.js

Lines changed: 0 additions & 5 deletions
This file was deleted.

app/code/Magento/PageBuilder/view/adminhtml/web/js/render/tree.js

Lines changed: 0 additions & 5 deletions
This file was deleted.

app/code/Magento/PageBuilder/view/adminhtml/web/js/render/view-model.js

Lines changed: 0 additions & 49 deletions
This file was deleted.

0 commit comments

Comments
 (0)