diff --git a/app/code/Magento/Backend/view/adminhtml/templates/page/js/require_js.phtml b/app/code/Magento/Backend/view/adminhtml/templates/page/js/require_js.phtml index a218b027ec4bd43024d89e0aa18aceee8a0b2b42..2e694b772c3c45babdb0f0a6318ae9ae29d992ec 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/page/js/require_js.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/page/js/require_js.phtml @@ -5,11 +5,6 @@ */ ?> <script> - var BLANK_URL = '<?php echo $this->getViewFileUrl('blank.html') ?>'; - var BLANK_IMG = '<?php echo $this->getViewFileUrl('spacer.gif') ?>'; - var BASE_URL = '<?php echo $this->getUrl('*') ?>'; - var FORM_KEY = '<?php echo $this->getFormKey() ?>'; - var require = { - "baseUrl": "<?php echo $this->getViewFileUrl('/') ?>" - }; + var BASE_URL = '<?php echo $this->getUrl('*') ?>', + FORM_KEY = '<?php echo $this->getFormKey() ?>'; </script> diff --git a/app/code/Magento/Theme/view/frontend/layout/default.xml b/app/code/Magento/Theme/view/frontend/layout/default.xml index b0f2b06196e0228ba337ba317b88c2e8ddf53338..c6769c7cfe7cf3ede4c0c39487378c4e8eb48649 100644 --- a/app/code/Magento/Theme/view/frontend/layout/default.xml +++ b/app/code/Magento/Theme/view/frontend/layout/default.xml @@ -8,8 +8,6 @@ <page layout="3columns" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"> <update handle="default_head_blocks"/> <body> - <!-- Temporary solution --> - <block name="require.js" class="Magento\Framework\View\Element\Template" template="Magento_Theme::js/require_js.phtml" /> <referenceContainer name="after.body.start"> <block class="Magento\RequireJs\Block\Html\Head\Config" name="requirejs-config"/> <block class="Magento\Translation\Block\Js" name="translate" template="Magento_Translation::translate.phtml"/> diff --git a/app/code/Magento/Theme/view/frontend/templates/js/require_js.phtml b/app/code/Magento/Theme/view/frontend/templates/js/require_js.phtml deleted file mode 100644 index 97d0888128561b583f446883da74c1857841846a..0000000000000000000000000000000000000000 --- a/app/code/Magento/Theme/view/frontend/templates/js/require_js.phtml +++ /dev/null @@ -1,11 +0,0 @@ -<?php -/** - * Copyright © 2015 Magento. All rights reserved. - * See COPYING.txt for license details. - */ -?> -<script> - var require = { - "baseUrl": "<?php echo $this->getViewFileUrl('/') ?>" - }; -</script>