MAGETWO-32484: Stabilization of changes and bug fixing

Denys Rul · Denys Rul · commit fa7a7c263171 · 2015-01-26T12:52:09.000+02:00
- Remove inline js code injections
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
@@ -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
@@ -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
