Skip to content

Commit afcae0c

Browse files
author
Bohdan Korablov
committed
MAGETWO-47054: BaseURL in Static View Files
1 parent 81ee51c commit afcae0c

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

lib/internal/Magento/Framework/RequireJs/Config.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ class Config
5454
*/
5555
const FULL_CONFIG_TEMPLATE = <<<config
5656
(function(require){
57-
%base%
5857
%function%
5958
6059
%usages%
@@ -134,7 +133,6 @@ public function __construct(
134133
public function getConfig()
135134
{
136135
$distributedConfig = '';
137-
$baseConfig = $this->getBaseConfig();
138136
$customConfigFiles = $this->fileSource->getFiles($this->design->getDesignTheme(), self::CONFIG_FILE_NAME);
139137
foreach ($customConfigFiles as $file) {
140138
/** @var $fileReader \Magento\Framework\Filesystem\File\Read */
@@ -148,8 +146,8 @@ public function getConfig()
148146
}
149147

150148
$fullConfig = str_replace(
151-
['%function%', '%base%', '%usages%'],
152-
[$distributedConfig, $baseConfig],
149+
['%function%', '%usages%'],
150+
[$distributedConfig],
153151
self::FULL_CONFIG_TEMPLATE
154152
);
155153

lib/internal/Magento/Framework/RequireJs/Test/Unit/ConfigTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,6 @@ public function testGetConfig()
129129

130130
$expected = <<<expected
131131
(function(require){
132-
require.config({"baseUrl":""});
133132
(function() {
134133
file_one.js content
135134
require.config(config);

0 commit comments

Comments
 (0)