From 0f7ae506de6d128b218283e92549dc7e04ba3c61 Mon Sep 17 00:00:00 2001
From: Oleksandr Karpenko <okarpenko@ebay.com>
Date: Wed, 23 Sep 2015 16:42:30 +0300
Subject: [PATCH] MAGETWO-42835: Bundled js files are not loaded if minified
---
app/code/Magento/Deploy/Model/Deployer.php | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/app/code/Magento/Deploy/Model/Deployer.php b/app/code/Magento/Deploy/Model/Deployer.php
index d6623e70ca8..cada5a4549a 100644
--- a/app/code/Magento/Deploy/Model/Deployer.php
+++ b/app/code/Magento/Deploy/Model/Deployer.php
@@ -118,27 +118,23 @@ class Deployer
/** @var \Magento\Theme\Model\View\Design $design */
$design = $this->objectManager->create('Magento\Theme\Model\View\Design');
$design->setDesignTheme($themePath, $area);
+ $assetRepo = $this->objectManager->create(
+ 'Magento\Framework\View\Asset\Repository',
+ [
+ 'design' => $design,
+ ]
+ );
$fileManager = $this->objectManager->create(
'Magento\RequireJs\Model\FileManager',
[
'config' => $this->objectManager->create(
'Magento\Framework\RequireJs\Config',
[
- 'assetRepo' => $this->objectManager->create(
- 'Magento\Framework\View\Asset\Repository',
- [
- 'design' => $design,
- ]
- ),
- 'design' => $design,
- ]
- ),
- 'assetRepo' => $this->objectManager->create(
- 'Magento\Framework\View\Asset\Repository',
- [
+ 'assetRepo' => $assetRepo,
'design' => $design,
]
),
+ 'assetRepo' => $assetRepo,
]
);
$fileManager->createRequireJsConfigAsset();
--
GitLab