Skip to content

Commit 3c4449d

Browse files
committed
Merge branch 'MAGETWO-31191' of https://github.corp.ebay.com/magento-vanilla/magento2ce into MAGETWO-31191
2 parents 33123a0 + b2a4dc6 commit 3c4449d

File tree

4 files changed

+58
-49
lines changed

4 files changed

+58
-49
lines changed

app/code/Magento/Backend/view/adminhtml/templates/page/js/require_js.phtml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@
55
*/
66
?>
77
<script>
8-
var BLANK_URL = '<?php echo $this->getViewFileUrl('blank.html') ?>';
9-
var BLANK_IMG = '<?php echo $this->getViewFileUrl('spacer.gif') ?>';
10-
var BASE_URL = '<?php echo $this->getUrl('*') ?>';
11-
var FORM_KEY = '<?php echo $this->getFormKey() ?>';
12-
var require = {
13-
"baseUrl": "<?php echo $this->getViewFileUrl('/') ?>"
14-
};
8+
var BASE_URL = '<?php echo $this->getUrl('*') ?>',
9+
FORM_KEY = '<?php echo $this->getFormKey() ?>';
1510
</script>

app/code/Magento/Theme/view/frontend/layout/default.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
<page layout="3columns" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
99
<update handle="default_head_blocks"/>
1010
<body>
11-
<!-- Temporary solution -->
12-
<block name="require.js" class="Magento\Framework\View\Element\Template" template="Magento_Theme::js/require_js.phtml" />
1311
<referenceContainer name="after.body.start">
1412
<block class="Magento\RequireJs\Block\Html\Head\Config" name="requirejs-config"/>
1513
<block class="Magento\Translation\Block\Js" name="translate" template="Magento_Translation::translate.phtml"/>

app/code/Magento/Theme/view/frontend/templates/js/require_js.phtml

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

composer.lock

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

0 commit comments

Comments
 (0)