tonyair
/
silverstripe-framework
mirror of https://github.com/silverstripe/silverstripe-framework
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FIX Remove attribute when calling customScript with the same uniquenessID

This commit is contained in:
Finlay Metcalfe 2023-12-21 10:18:32 +13:00
parent 908298db13
commit d8ad1ebbf4
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/View/Requirements_Backend.php
View File

@ -502,6 +502,9 @@ class Requirements_Backend
public function customScript($script, $uniquenessID = null)
{
if ($uniquenessID) {
if (isset($this->customScriptAttributes[$uniquenessID])) {
unset($this->customScriptAttributes[$uniquenessID]);
}
$this->customScript[$uniquenessID] = $script;
} else {
$this->customScript[] = $script;

15
tests/php/View/RequirementsTest.php
View File

@ -1437,11 +1437,13 @@ EOS
// Create requirements that are to be overwritten
$backend->customScript("Do Not Display", 42);
$backend->customScriptWithAttributes("Do Not Display", ['type' => 'module', 'crossorigin' => 'use-credentials'], 84);
$backend->customCSS("Do Not Display", 42);
$backend->insertHeadTags("<span>Do Not Display</span>", 42);
// Override
$backend->customScriptWithAttributes("Override", ['type' => 'module', 'crossorigin' => 'use-credentials'], 42);
$backend->customScript("Override", 84);
$backend->customCSS("Override", 42);
$backend->insertHeadTags("<span>Override</span>", 42);
@ -1460,6 +1462,19 @@ EOS
'customScript is correctly not displaying original write'
);
/* customScriptWithAttributes is overwritten by customScript */
$this->assertMatchesRegularExpression(
"#<script type=\"application/javascript\">//<!\[CDATA\[\s*Override\s*//\]\]></script>#s",
$html,
'customScript is displaying latest write and clearing attributes'
);
$this->assertDoesNotMatchRegularExpression(
"#<script type=\"module\" crossorigin=\"use-credentials\">//<!\[CDATA\[\s*Do Not Display\s*//\]\]></script>#s",
$html,
'customScript is displaying latest write'
);
/* customCSS is overwritten */
$this->assertMatchesRegularExpression(
"#<style type=\"text/css\">\s*Override\s*</style>#",