Skip to content

Commit 0cd4938

Browse files
committed
ACP2E-3864: Update copyrights for PB and fix static failures
1 parent 926aef7 commit 0cd4938

File tree

12 files changed

+41
-27
lines changed

12 files changed

+41
-27
lines changed

app/code/Magento/PageBuilder/view/adminhtml/templates/form/element/conditions.phtml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33
* Copyright 2018 Adobe
44
* All Rights Reserved.
55
*/
6-
?>
7-
<?php
6+
87
/** @var $block \Magento\PageBuilder\Block\Adminhtml\Form\Element\ProductConditions */
8+
/** @var $escaper \Magento\Framework\Escaper */
9+
910
$attribute = $block->getData('attribute');
1011
$id = $block->getData('formNamespace') . '_' . $attribute;
1112
$role = 'pagebuilder-conditions-form-placeholder-' . $attribute;
@@ -15,9 +16,9 @@ $role = 'pagebuilder-conditions-form-placeholder-' . $attribute;
1516
</label>
1617
<div class="admin__field-control">
1718
<div class="rule-tree">
18-
<fieldset id="<?= $block->escapeHtmlAttr($id) ?>" class="fieldset">
19+
<fieldset id="<?= $escaper->escapeHtmlAttr($id) ?>" class="fieldset">
1920
<div class="rule-tree-wrapper">
20-
<div data-role="<?= $block->escapeHtmlAttr($role) ?>"></div>
21+
<div data-role="<?= $escaper->escapeHtmlAttr($role) ?>"></div>
2122
</div>
2223
</fieldset>
2324
</div>

app/code/Magento/PageBuilder/view/adminhtml/templates/html/head/babel_polyfill.phtml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55
*/
66

77
/* @var $block \Magento\PageBuilder\Block\Adminhtml\Html\Head\BabelPolyfill */
8+
/** @var $escaper \Magento\Framework\Escaper */
89

910
if ($block->shouldLoadPolyfill()) : ?>
10-
<script src="<?= $block->escapeUrl($block->getJsUrl()) ?>"></script>
11+
<script src="<?= $escaper->escapeUrl($block->getJsUrl()) ?>"></script>
1112
<?php endif; ?>
1213

app/code/Magento/PageBuilder/view/adminhtml/templates/system/config/enable_field/modal_content_body.phtml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,20 @@
44
* All Rights Reserved.
55
*/
66

7+
/** @var $escaper \Magento\Framework\Escaper */
78
?>
89
<div class="pagebuilder-modal-content-body">
9-
<p><?= $block->escapeHtml(__('This will change your Admin and storefront by:')) ?></p>
10+
<p><?= $escaper->escapeHtml(__('This will change your Admin and storefront by:')) ?></p>
1011
<ul>
1112
<li>
12-
<strong><?= $block->escapeHtml(__('Removing PageBuilder\'s advanced content tools')) ?></strong>
13-
<?= $block->escapeHtml(
13+
<strong><?= $escaper->escapeHtml(__('Removing PageBuilder\'s advanced content tools')) ?></strong>
14+
<?= $escaper->escapeHtml(
1415
__('from their assigned text fields and adding a basic text editor as replacement.')
1516
) ?>
1617
</li>
1718
<li>
18-
<strong><?= $block->escapeHtml(__('Potentially creating display errors on your storefront')) ?></strong>
19-
<?= $block->escapeHtml(
19+
<strong><?= $escaper->escapeHtml(__('Potentially creating display errors on your storefront')) ?></strong>
20+
<?= $escaper->escapeHtml(
2021
__(', due to content reformatting. Also, some content may no longer be editable from within the Admin.')
2122
) ?>
2223
</li>

app/code/Magento/PageBuilder/view/adminhtml/templates/system/config/google_maps_api_key.phtml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,21 @@
66

77
/**
88
* @var \Magento\PageBuilder\Block\Adminhtml\System\Config\Form\Field\GoogleMapsApiKey $block
9+
* @var $escaper \Magento\Framework\Escaper
910
*/
1011
?>
1112
<button class="scalable"
1213
type="button"
13-
id="<?= $block->escapeHtmlAttr($block->getHtmlId()) ?>"
14+
id="<?= $escaper->escapeHtmlAttr($block->getHtmlId()) ?>"
1415
data-mage-init='{
1516
"Magento_PageBuilder/js/system/config/google-maps-api-key-validator": {
16-
"elementId": "<?= $block->escapeJs($block->getHtmlId()) ?>",
17-
"validateUrl": "<?= $block->escapeJs($block->getValidateUrl()) ?>",
18-
"buttonLabel": "<?= $block->escapeJs($block->getButtonLabel()) ?>",
19-
"validLabel": "<?= $block->escapeJs($block->getValidLabel()) ?>",
20-
"invalidLabel": "<?= $block->escapeJs($block->getInvalidLabel()) ?>",
21-
"sourceField": "<?= $block->escapeJs($block->getSourceField()) ?>"
17+
"elementId": "<?= $escaper->escapeJs($block->getHtmlId()) ?>",
18+
"validateUrl": "<?= $escaper->escapeJs($block->getValidateUrl()) ?>",
19+
"buttonLabel": "<?= $escaper->escapeJs($block->getButtonLabel()) ?>",
20+
"validLabel": "<?= $escaper->escapeJs($block->getValidLabel()) ?>",
21+
"invalidLabel": "<?= $escaper->escapeJs($block->getInvalidLabel()) ?>",
22+
"sourceField": "<?= $escaper->escapeJs($block->getSourceField()) ?>"
2223
}
2324
}'
2425
disabled="disabled"
25-
><span class="result"><?= $block->escapeHtml($block->getButtonLabel()) ?></span></button>
26+
><span class="result"><?= $escaper->escapeHtml($block->getButtonLabel()) ?></span></button>

app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_template-manager.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
padding: .5rem;
8686
}
8787
}
88-
88+
// @codingStandardsIgnoreStart
8989
.pagebuilder_stage_template_pagebuilder_stage_template_modal_pagebuilder_stage_template_grid,
9090
.pagebuilder-template-index .admin__data-grid-wrap {
9191
.data-grid th:nth-child(1) {
@@ -119,7 +119,7 @@
119119
width: 20rem;
120120
}
121121
}
122-
122+
// @codingStandardsIgnoreEnd
123123
.preview-image-preview-image-block {
124124
padding-bottom: 3rem;
125125
}

app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/banner/_default.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,11 +141,11 @@
141141
.pagebuilder-banner-wrapper {
142142
overflow-wrap: break-word;
143143
word-wrap: break-word;
144-
144+
// @codingStandardsIgnoreStart
145145
.pagebuilder-overlay:not(.pagebuilder-poster-overlay) {
146146
max-width: 540px;
147147
}
148-
148+
// @codingStandardsIgnoreEnd
149149
[data-element='content'] {
150150
min-height: 50px;
151151
}

app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/banner/_mobile.less

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,13 @@
66
//
77
// Default appearance styles rendered through Mobile viewport
88
// _____________________________________________________
9+
10+
// @codingStandardsIgnoreStart
911
.mobile-viewport {
1012
.pagebuilder-banner-wrapper {
1113
.pagebuilder-overlay:not(.pagebuilder-poster-overlay) {
1214
max-width: none;
1315
}
1416
}
1517
}
18+
// @codingStandardsIgnoreEnd

app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/button-item/_default.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@
4646
transition: all .3s;
4747
visibility: hidden;
4848
width: 14px;
49-
49+
// @codingStandardsIgnoreStart
5050
&.disabled:before {
5151
color: @color-light-gray;
5252
cursor: not-allowed;
5353
}
54-
54+
// @codingStandardsIgnoreEnd
5555
&.disabled:active:before {
5656
cursor: not-allowed;
5757
}

app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/divider/_default.less

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
// Default appearance styles
88
// _____________________________________________
99

10+
11+
// @codingStandardsIgnoreStart
1012
.pagebuilder-divider hr {
1113
border: none;
1214
border-color: @border_color_empty; // match for default color on frontend
@@ -18,3 +20,4 @@
1820
max-width: 100%;
1921
width: 100%;
2022
}
23+
// @codingStandardsIgnoreEnd

app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/products/_swatches.less

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@
183183
box-shadow: unset;
184184
cursor: default;
185185
pointer-events: none;
186-
186+
// @codingStandardsIgnoreStart
187187
&:after {
188188
// ToDo: improve .lib-background-gradient() to support diagonal gradient
189189
background: linear-gradient(to left top, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0) 42%, rgba(255, 255, 255, 1) 43%, rgba(255, 255, 255, 1) 46%, rgba(255, 82, 22, 1) 47%, rgba(255, 82, 22, 1) 53%, rgba(255, 255, 255, 1) 54%, rgba(255, 255, 255, 1) 57%, rgba(255, 255, 255, 0) 58%, rgba(255, 255, 255, 0) 100%);
@@ -200,6 +200,7 @@
200200
right: 0;
201201
top: 0;
202202
}
203+
// @codingStandardsIgnoreEnd
203204
}
204205

205206
&-disabled {

0 commit comments

Comments
 (0)