Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
cl_server
Manage
Activity
Members
Labels
Plan
Wiki
Custom issue tracker
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
project
cl_server
Merge requests
!21
Issue
#3286526
: Automated Drupal 10 compatibility fixes
Code
Review changes
Check out branch
Download
Patches
Plain diff
Open
Issue
#3286526
: Automated Drupal 10 compatibility fixes
issue/cl_server-3286526:3286526-automated-drupal-10
into
1.x
Overview
0
Commits
1
Pipelines
0
Changes
4
Open
Ludovic Favre
requested to merge
issue/cl_server-3286526:3286526-automated-drupal-10
into
1.x
1 year ago
Overview
0
Commits
1
Pipelines
0
Changes
4
Expand
From patch provided by
@edmoreta
Closes
#3286526
0
0
Merge request reports
Compare
1.x
1.x (HEAD)
and
latest version
latest version
477c9576
1 commit,
1 year ago
4 files
+
13
−
10
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
4
Search (e.g. *.vue) (Ctrl+P)
src/Asset/UnoptimizedAssetResolver.php
+
8
−
5
Options
@@ -5,7 +5,8 @@ namespace Drupal\cl_server\Asset;
use
Drupal\Core\Asset\AssetResolverInterface
;
use
Drupal\cl_server
\Util
;
use
Drupal\Core\Asset\AttachedAssetsInterface
;
use
Drupal\Core\Http\RequestStack
;
use
Drupal\Core\Language\LanguageInterface
;
use
Symfony\Component\HttpFoundation\RequestStack
;
/**
* The asset resolver that forces skipping optimizations.
@@ -41,20 +42,22 @@ class UnoptimizedAssetResolver implements AssetResolverInterface {
/**
* @inheritDoc
*/
public
function
getCssAssets
(
AttachedAssetsInterface
$assets
,
$optimize
)
{
public
function
getCssAssets
(
AttachedAssetsInterface
$assets
,
$optimize
,
LanguageInterface
$language
=
NULL
)
{
return
$this
->
resolver
->
getCssAssets
(
$assets
,
$this
->
skipOptimization
?
FALSE
:
$optimize
$this
->
skipOptimization
?
FALSE
:
$optimize
,
$language
);
}
/**
* @inheritDoc
*/
public
function
getJsAssets
(
AttachedAssetsInterface
$assets
,
$optimize
)
{
public
function
getJsAssets
(
AttachedAssetsInterface
$assets
,
$optimize
,
LanguageInterface
$language
=
NULL
)
{
return
$this
->
resolver
->
getJsAssets
(
$assets
,
$this
->
skipOptimization
?
FALSE
:
$optimize
$this
->
skipOptimization
?
FALSE
:
$optimize
,
$language
);
}
Loading