Skip to content

Commit

Permalink
Merge branch '5.x-dev' into PG-2738-copy-tag-option
Browse files Browse the repository at this point in the history
  • Loading branch information
@snake14
snake14 committed Nov 20, 2024
2 parents 96e29ed + fc64f1c commit ff8bd09
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 4 deletions.
1 change: 1 addition & 0 deletions Template/Tag/CustomHtmlTag.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ public function getParameters()
['<a rel="noreferrer noopener" target="_blank" href="' . Url::addCampaignParametersToMatomoLink('https://matomo.org/faq/tag-manager/faq_26815/', null, null, 'App.TagManager.getParameters') . '">', '</a>']
);
$field->validators[] = new NotEmpty();
$field->uiControlAttributes = ['spellcheck' => 'false'];
}),
$this->makeSetting('htmlPosition', 'bodyEnd', FieldConfig::TYPE_STRING, function (FieldConfig $field) {
$field->title = Piwik::translate('TagManager_CustomHtmlHtmlPositionTitle');
Expand Down
16 changes: 12 additions & 4 deletions tests/Integration/Model/TagTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,7 @@ public function testAddContainerTagSuccessMinimal()
'uiControl' => 'textarea',
'uiControlAttributes' =>
[
'spellcheck' => 'false'
],
'availableValues' => null,
'description' => 'This tag is ideal when you need to add for example custom styles or custom JavaScript or when you are looking for a specific tag which is not yet supported. With this tag you can append any HTML to the bottom of your page, add styles, or execute JavaScript. Note: You can replace content within the HTML with variables by putting a variable name in curly brackets like this {{PageUrl}}.',
Expand All @@ -298,7 +299,8 @@ public function testAddContainerTagSuccessMinimal()
'defaultValue' => 'bodyEnd',
'type' => 'string',
'uiControl' => 'select',
'uiControlAttributes' => [],
'uiControlAttributes' => [
],
'availableValues' => [
'headStart' => 'Head Start',
'headEnd' => 'Head End',
Expand Down Expand Up @@ -374,6 +376,7 @@ public function testAddContainerTagSuccessFull()
'uiControl' => 'textarea',
'uiControlAttributes' =>
[
'spellcheck' => 'false'
],
'availableValues' => null,
'description' => 'This tag is ideal when you need to add for example custom styles or custom JavaScript or when you are looking for a specific tag which is not yet supported. With this tag you can append any HTML to the bottom of your page, add styles, or execute JavaScript. Note: You can replace content within the HTML with variables by putting a variable name in curly brackets like this {{PageUrl}}.',
Expand All @@ -393,7 +396,8 @@ public function testAddContainerTagSuccessFull()
'defaultValue' => 'bodyEnd',
'type' => 'string',
'uiControl' => 'select',
'uiControlAttributes' => [],
'uiControlAttributes' => [
],
'availableValues' => [
'headStart' => 'Head Start',
'headEnd' => 'Head End',
Expand Down Expand Up @@ -565,6 +569,7 @@ public function testUpdateContainerTagSuccess()
'uiControl' => 'textarea',
'uiControlAttributes' =>
[
'spellcheck' => 'false'
],
'availableValues' => null,
'description' => 'This tag is ideal when you need to add for example custom styles or custom JavaScript or when you are looking for a specific tag which is not yet supported. With this tag you can append any HTML to the bottom of your page, add styles, or execute JavaScript. Note: You can replace content within the HTML with variables by putting a variable name in curly brackets like this {{PageUrl}}.',
Expand All @@ -584,7 +589,8 @@ public function testUpdateContainerTagSuccess()
'defaultValue' => 'bodyEnd',
'type' => 'string',
'uiControl' => 'select',
'uiControlAttributes' => [],
'uiControlAttributes' => [
],
'availableValues' => [
'headStart' => 'Head Start',
'headEnd' => 'Head End',
Expand Down Expand Up @@ -931,6 +937,7 @@ public function testUpdateParametersSuccess()
'uiControl' => 'textarea',
'uiControlAttributes' =>
[
'spellcheck' => 'false'
],
'availableValues' => null,
'description' => 'This tag is ideal when you need to add for example custom styles or custom JavaScript or when you are looking for a specific tag which is not yet supported. With this tag you can append any HTML to the bottom of your page, add styles, or execute JavaScript. Note: You can replace content within the HTML with variables by putting a variable name in curly brackets like this {{PageUrl}}.',
Expand All @@ -950,7 +957,8 @@ public function testUpdateParametersSuccess()
'defaultValue' => 'bodyEnd',
'type' => 'string',
'uiControl' => 'select',
'uiControlAttributes' => [],
'uiControlAttributes' => [
],
'availableValues' => [
'headStart' => 'Head Start',
'headEnd' => 'Head End',
Expand Down
1 change: 1 addition & 0 deletions tests/System/expected/test_tag1__TagManager.getContainerTag.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
<type>string</type>
<uiControl>textarea</uiControl>
<uiControlAttributes>
<spellcheck>false</spellcheck>
</uiControlAttributes>
<availableValues />
<description>This tag is ideal when you need to add for example custom styles or custom JavaScript or when you are looking for a specific tag which is not yet supported. With this tag you can append any HTML to the bottom of your page, add styles, or execute JavaScript. Note: You can replace content within the HTML with variables by putting a variable name in curly brackets like this {{PageUrl}}.</description>
Expand Down
1 change: 1 addition & 0 deletions tests/System/expected/test_tag2__TagManager.getContainerTag.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
<type>string</type>
<uiControl>textarea</uiControl>
<uiControlAttributes>
<spellcheck>false</spellcheck>
</uiControlAttributes>
<availableValues />
<description>This tag is ideal when you need to add for example custom styles or custom JavaScript or when you are looking for a specific tag which is not yet supported. With this tag you can append any HTML to the bottom of your page, add styles, or execute JavaScript. Note: You can replace content within the HTML with variables by putting a variable name in curly brackets like this {{PageUrl}}.</description>
Expand Down
1 change: 1 addition & 0 deletions tests/System/expected/test_webContext__TagManager.getAvailableTagTypesInContext.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1650,6 +1650,7 @@
<type>string</type>
<uiControl>textarea</uiControl>
<uiControlAttributes>
<spellcheck>false</spellcheck>
</uiControlAttributes>
<availableValues />
<description>This tag is ideal when you need to add for example custom styles or custom JavaScript or when you are looking for a specific tag which is not yet supported. With this tag you can append any HTML to the bottom of your page, add styles, or execute JavaScript. Note: You can replace content within the HTML with variables by putting a variable name in curly brackets like this {{PageUrl}}.</description>
Expand Down
2 changes: 2 additions & 0 deletions tests/System/expected/test_with_content__TagManager.getContainerTags.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
<type>string</type>
<uiControl>textarea</uiControl>
<uiControlAttributes>
<spellcheck>false</spellcheck>
</uiControlAttributes>
<availableValues />
<description>This tag is ideal when you need to add for example custom styles or custom JavaScript or when you are looking for a specific tag which is not yet supported. With this tag you can append any HTML to the bottom of your page, add styles, or execute JavaScript. Note: You can replace content within the HTML with variables by putting a variable name in curly brackets like this {{PageUrl}}.</description>
Expand Down Expand Up @@ -133,6 +134,7 @@
<type>string</type>
<uiControl>textarea</uiControl>
<uiControlAttributes>
<spellcheck>false</spellcheck>
</uiControlAttributes>
<availableValues />
<description>This tag is ideal when you need to add for example custom styles or custom JavaScript or when you are looking for a specific tag which is not yet supported. With this tag you can append any HTML to the bottom of your page, add styles, or execute JavaScript. Note: You can replace content within the HTML with variables by putting a variable name in curly brackets like this {{PageUrl}}.</description>
Expand Down

0 comments on commit ff8bd09

Please sign in to comment.