Skip to content

Commit 806ea54

Browse files
author
Hwashiang Yu
committed
MAGETWO-55808: Eliminate @escapeNotVerified in Product Modules
- Resolved functional test failures due to template changes
1 parent e70773b commit 806ea54

File tree

3 files changed

+15
-17
lines changed

3 files changed

+15
-17
lines changed

app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/create/items/renderer.phtml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -82,14 +82,13 @@
8282
<?php if ($_remainder):?>
8383
... <span id="<?= $block->escapeHtmlAttr($_id = 'id' . uniqid()) ?>"><?= $block->escapeHtml($_remainder) ?></span>
8484
<script>
85-
require(['prototype'], function(){
86-
87-
$('<?= $block->escapeJs($_id) ?>').hide();
88-
$('<?= $block->escapeJs($_id) ?>').up().observe('mouseover', function(){$('<?= $block->escapeJs($_id) ?>').show();});
89-
$('<?= $block->escapeJs($_id) ?>').up().observe('mouseout', function(){$('<?= $block->escapeJs($_id) ?>').hide();});
90-
91-
});
92-
</script>
85+
require(['prototype'], function(){
86+
<?php $escapedId = $block->escapeJs($_id) ?>
87+
$('<?= $escapedId ?>').hide();
88+
$('<?= $escapedId ?>').up().observe('mouseover', function(){$('<?= $escapedId ?>').show();});
89+
$('<?= $escapedId ?>').up().observe('mouseout', function(){$('<?= $escapedId ?>').hide();});
90+
});
91+
</script>
9392
<?php endif;?>
9493
<?php endif;?>
9594
</dd>

app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/view/items/renderer.phtml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -77,14 +77,13 @@
7777
<?php if ($_remainder):?>
7878
... <span id="<?= $block->escapeHtmlAttr($_id = 'id' . uniqid()) ?>"><?= $block->escapeHtml($_remainder) ?></span>
7979
<script>
80-
require(['prototype'], function(){
81-
82-
$('<?= $block->escapeJs($_id) ?>').hide();
83-
$('<?= $block->escapeJs($_id) ?>').up().observe('mouseover', function(){$('<?= $block->escapeJs($_id) ?>').show();});
84-
$('<?= $block->escapeJs($_id) ?>').up().observe('mouseout', function(){$('<?= $block->escapeJs($_id) ?>').hide();});
85-
86-
});
87-
</script>
80+
require(['prototype'], function(){
81+
<?php $escapedId = $block->escapeJs($_id) ?>
82+
$('<?= $escapedId ?>').hide();
83+
$('<?= $escapedId ?>').up().observe('mouseover', function(){$('<?= $escapedId ?>').show();});
84+
$('<?= $escapedId ?>').up().observe('mouseout', function(){$('<?= $escapedId ?>').hide();});
85+
});
86+
</script>
8887
<?php endif;?>
8988
<?php endif;?>
9089
</dd>

app/code/Magento/Bundle/view/base/templates/product/price/selection/amount.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@
1010

1111
<?php /** @var \Magento\Framework\Pricing\Render\Amount $block */ ?>
1212

13-
<?= $block->escapeHtml($block->formatCurrency($block->getDisplayValue(), (bool) $block->getIncludeContainer())) ?>
13+
<?= /* @noEscape */ $block->formatCurrency($block->getDisplayValue(), (bool) $block->getIncludeContainer()) ?>

0 commit comments

Comments
 (0)