MC-4189: IE11 - PageBuilder Does Not Load

davemacaulay · davemacaulay · commit a447d68aa068 · 2018-09-18T18:49:54.000+02:00
- Only include babel polyfill for IE 11
diff --git a/app/code/Magento/PageBuilder/Block/Adminhtml/Html/Head/BabelPolyfill.php b/app/code/Magento/PageBuilder/Block/Adminhtml/Html/Head/BabelPolyfill.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\PageBuilder\Block\Adminhtml\Html\Head;
+
+use Magento\Framework\View\Element\Template;
+
+/**
+ * Class BabelPolyfill
+ *
+ * @package Magento\PageBuilder\Block
+ */
+class BabelPolyfill extends Template
+{
+    /**
+     * Detect if Page Builder is enabled before loading the polyfill
+     *
+     * @return bool
+     */
+    public function shouldLoadPolyfill() : bool
+    {
+        return (bool)$this->_scopeConfig->getValue(
+            \Magento\PageBuilder\Model\Config::IS_PAGEBUILDER_ENABLED
+        );
+    }
+
+    /**
+     * Build and return the polyfill static URL
+     *
+     * @return string
+     */
+    public function getJsUrl() : string
+    {
+        return $this->_assetRepo->getUrl("Magento_PageBuilder::js/babel/polyfill.min.js");
+    }
+}
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/layout/editor.xml b/app/code/Magento/PageBuilder/view/adminhtml/layout/editor.xml
@@ -7,6 +7,9 @@
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="admin-1column" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
+        <block class="Magento\Framework\View\Element\Template" name="head.additional" as="head.additional" template="Magento_PageBuilder::html/container.phtml">
+            <block class="Magento\PageBuilder\Block\Adminhtml\Html\Head\BabelPolyfill" name="pagebuilder.babel.polyfill" as="pagebuilder.babel.polyfill" template="Magento_PageBuilder::head/babel-polyfill.phtml"/>
+        </block>
         <referenceContainer name="before.body.end">
             <uiComponent name="pagebuilder_modal_form" />
         </referenceContainer>
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/requirejs-config.js b/app/code/Magento/PageBuilder/view/adminhtml/requirejs-config.js
@@ -29,9 +29,6 @@ var config = {
         }
     },
     shim: {
-        'Magento_PageBuilder/js/page-builder': {
-            deps: ['Magento_PageBuilder/js/babel/polyfill.min']
-        },
         'pagebuilder/ko-sortable': {
             deps: ['jquery', 'jquery/ui', 'Magento_PageBuilder/js/resource/jquery-ui/jquery.ui.touch-punch.min']
         },
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/templates/head/babel-polyfill.phtml b/app/code/Magento/PageBuilder/view/adminhtml/templates/head/babel-polyfill.phtml
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/* @var $block \Magento\PageBuilder\Block\Adminhtml\Html\Head\BabelPolyfill */
+
+if ($block->shouldLoadPolyfill()): ?>
+<script type="text/javascript">
+    if (/MSIE \d|Trident.*rv:/.test(navigator.userAgent)) {
+        document.write('<script src="<?= $block->getJsUrl() ?>"><\/script>');
+    }
+</script>
+<?php endif; ?>
+
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/templates/html/container.phtml b/app/code/Magento/PageBuilder/view/adminhtml/templates/html/container.phtml
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+// @codingStandardsIgnoreFile
+
+?>
+<?= $block->getChildHtml() ?>
