Skip to content

Possible fix for inline JS being added out of sequence #3924

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 3 commits into
base: develop
Choose a base branch
from
Draft

Possible fix for inline JS being added out of sequence #3924

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
430d298
Add redundant passing test to verify new asset test assertion
hughbris May 24, 2025
e7212cc
Modify asset test to a failing mixed sequence test (#1893)
hughbris May 24, 2025
ec065fd
Remove position set to 'after' by default for new inlineJs objects (#…
hughbris May 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion system/src/Grav/Common/Assets/InlineJs.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ public function __construct(array $elements = [], ?string $key = null)
{
$base_options = [
'asset_type' => 'js',
'position' => 'after'
];

$merged_attributes = Utils::arrayMergeRecursiveUnique($base_options, $elements);
Expand Down
22 changes: 22 additions & 0 deletions tests/unit/Grav/Common/AssetsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,6 +555,28 @@ public function testPriorityOfAssets(): void
self::assertSame('<link href="/test-before.css" type="text/css" rel="stylesheet">' . PHP_EOL .
'<link href="/test.css" type="text/css" rel="stylesheet">' . PHP_EOL .
'<link href="/test-after.css" type="text/css" rel="stylesheet">' . PHP_EOL, $css);

//----------------
$this->assets->reset();
$inline1 = "console.log('position 1');";
$inline2 = "console.log('position 4');";
$this->assets->addInlineJs($inline1, 100);
$this->assets->add('position2.js', 90);
$this->assets->add('position3.js', 80);
$this->assets->addInlineJs($inline2, 70);
$this->assets->add('position5.js', 60);

$js = $this->assets->js();
$expectedLines = [
'<script>', $inline1, '</script>',
'<script src="/position2.js"></script>',
'<script src="/position3.js"></script>',
'<script>', $inline2, '</script>',
'<script src="/position5.js"></script>',
];
$expected = implode(PHP_EOL, $expectedLines) . PHP_EOL;
self::assertSame($expected, $js);

}

public function testPipeline(): void
Expand Down