Skip to content

Commit b165f3d

Browse files
committed
MC-4189: IE11 - PageBuilder Does Not Load
- Resolve architecture comments
1 parent 929de12 commit b165f3d

File tree

6 files changed

+7598
-9
lines changed

6 files changed

+7598
-9
lines changed

app/code/Magento/PageBuilder/Block/Adminhtml/Html/Head/BabelPolyfill.php

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,33 @@
1717
*/
1818
class BabelPolyfill extends Template
1919
{
20+
/**
21+
* @var \Magento\PageBuilder\Model\ConfigInterface
22+
*/
23+
private $config;
24+
25+
/**
26+
* @param Template\Context $context
27+
* @param \Magento\PageBuilder\Model\ConfigInterface $config
28+
* @param array $data
29+
*/
30+
public function __construct(
31+
Template\Context $context,
32+
\Magento\PageBuilder\Model\ConfigInterface $config,
33+
array $data = []
34+
) {
35+
$this->config = $config;
36+
parent::__construct($context, $data);
37+
}
38+
2039
/**
2140
* Detect if Page Builder is enabled before loading the polyfill
2241
*
2342
* @return bool
2443
*/
2544
public function shouldLoadPolyfill() : bool
2645
{
27-
return (bool)$this->_scopeConfig->getValue(
28-
\Magento\PageBuilder\Model\Config::IS_PAGEBUILDER_ENABLED
29-
);
46+
return $this->config->isEnabled();
3047
}
3148

3249
/**
@@ -36,6 +53,6 @@ public function shouldLoadPolyfill() : bool
3653
*/
3754
public function getJsUrl() : string
3855
{
39-
return $this->_assetRepo->getUrl("Magento_PageBuilder::js/babel/polyfill.min.js");
56+
return $this->_assetRepo->getUrl("Magento_PageBuilder::js/resource/babel/polyfill.min.js");
4057
}
4158
}

app/code/Magento/PageBuilder/view/adminhtml/layout/editor.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="admin-1column" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
99
<body>
1010
<block class="Magento\Framework\View\Element\Template" name="head.additional" as="head.additional" template="Magento_PageBuilder::html/container.phtml">
11-
<block class="Magento\PageBuilder\Block\Adminhtml\Html\Head\BabelPolyfill" name="pagebuilder.babel.polyfill" as="pagebuilder.babel.polyfill" template="Magento_PageBuilder::head/babel-polyfill.phtml"/>
11+
<block class="Magento\PageBuilder\Block\Adminhtml\Html\Head\BabelPolyfill" name="pagebuilder.babel.polyfill" as="pagebuilder.babel.polyfill" template="Magento_PageBuilder::html/head/babel_polyfill.phtml"/>
1212
</block>
1313
<referenceContainer name="before.body.end">
1414
<uiComponent name="pagebuilder_modal_form" />

0 commit comments

Comments
 (0)