File tree Expand file tree Collapse file tree 2 files changed +26
-24
lines changed
lib/internal/Magento/Framework/RequireJs Expand file tree Collapse file tree 2 files changed +26
-24
lines changed Original file line number Diff line number Diff line change @@ -293,25 +293,26 @@ protected function getConfigFileName()
293
293
*/
294
294
public function getMinResolverCode ()
295
295
{
296
- $ excludes = ['url.indexOf(baseUrl) === 0 ' ];
296
+ $ excludes = ['url.indexOf(baseUrl)===0 ' ];
297
297
foreach ($ this ->minification ->getExcludes ('js ' ) as $ expression ) {
298
298
$ excludes [] = '!url.match(/ ' . str_replace ('/ ' , '\/ ' , $ expression ) . '/) ' ;
299
299
}
300
300
$ excludesCode = empty ($ excludes ) ? 'true ' : implode ('&& ' , $ excludes );
301
301
302
302
$ result = <<<code
303
- var ctx = require.s.contexts._,
304
- origNameToUrl = ctx.nameToUrl,
305
- baseUrl = ctx.config.baseUrl;
306
-
307
- ctx.nameToUrl = function() {
308
- var url = origNameToUrl.apply(ctx, arguments);
309
- if ( {$ excludesCode }) {
310
- url = url.replace(/(\.min)?\.js$/, '.min.js');
311
- }
312
- return url;
313
- };
314
-
303
+ (function () {
304
+ var ctx = require.s.contexts._,
305
+ origNameToUrl = ctx.nameToUrl,
306
+ baseUrl = ctx.config.baseUrl;
307
+
308
+ ctx.nameToUrl = function() {
309
+ var url = origNameToUrl.apply(ctx, arguments);
310
+ if ( {$ excludesCode }) {
311
+ url = url.replace(/(\.min)?\.js$/, '.min.js');
312
+ }
313
+ return url;
314
+ };
315
+ })();
315
316
code ;
316
317
317
318
if ($ this ->minification ->isEnabled ('js ' )) {
Original file line number Diff line number Diff line change @@ -193,18 +193,19 @@ public function testGetMinResolverCode()
193
193
->willReturnArgument (0 );
194
194
195
195
$ expected = <<<code
196
- var ctx = require.s.contexts._,
197
- origNameToUrl = ctx.nameToUrl,
198
- baseUrl = ctx.config.baseUrl;
199
-
200
- ctx.nameToUrl = function() {
201
- var url = origNameToUrl.apply(ctx, arguments);
202
- if (url.indexOf(baseUrl) === 0&&!url.match(/\.min\./)) {
203
- url = url.replace(/(\.min)?\.js$/, '.min.js');
204
- }
205
- return url;
206
- };
196
+ (function () {
197
+ var ctx = require.s.contexts._,
198
+ origNameToUrl = ctx.nameToUrl,
199
+ baseUrl = ctx.config.baseUrl;
207
200
201
+ ctx.nameToUrl = function() {
202
+ var url = origNameToUrl.apply(ctx, arguments);
203
+ if (url.indexOf(baseUrl)===0&&!url.match(/\.min\./)) {
204
+ url = url.replace(/(\.min)?\.js$/, '.min.js');
205
+ }
206
+ return url;
207
+ };
208
+ })();
208
209
code ;
209
210
$ this ->assertEquals ($ expected , $ this ->object ->getMinResolverCode ());
210
211
}
You can’t perform that action at this time.
0 commit comments