Skip to content

Commit 042081e

Browse files
author
Hwashiang Yu
committed
MAGETWO-55808: Eliminate @escapeNotVerified in Product Modules
- Cleaned up renderer templates of redundant variable escape
1 parent ecc10f7 commit 042081e

File tree

8 files changed

+50
-56
lines changed

8 files changed

+50
-56
lines changed

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

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -188,14 +188,13 @@
188188
<?php if ($_remainder):?>
189189
... <span id="<?= $block->escapeHtmlAttr($_id = 'id' . uniqid()) ?>"><?= $block->escapeHtml($_remainder) ?></span>
190190
<script>
191-
require(['prototype'], function(){
192-
193-
$('<?= $block->escapeJs($_id) ?>').hide();
194-
$('<?= $block->escapeJs($_id) ?>').up().observe('mouseover', function(){$('<?= $block->escapeJs($_id) ?>').show();});
195-
$('<?= $block->escapeJs($_id) ?>').up().observe('mouseout', function(){$('<?= $block->escapeJs($_id) ?>').hide();});
196-
197-
});
198-
</script>
191+
require(['prototype'], function(){
192+
<?php $escapedId = $block->escapeJs($_id) ?>
193+
$('<?= $escapedId ?>').hide();
194+
$('<?= $escapedId ?>').up().observe('mouseover', function(){$('<?= $escapedId ?>').show();});
195+
$('<?= $escapedId ?>').up().observe('mouseout', function(){$('<?= $escapedId ?>').hide();});
196+
});
197+
</script>
199198
<?php endif;?>
200199
<?php endif;?>
201200
</dd>

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

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -115,14 +115,13 @@
115115
<?php if ($_remainder):?>
116116
... <span id="<?= $block->escapeHtmlAttr($_id = 'id' . uniqid()) ?>"><?= $block->escapeHtml($_remainder) ?></span>
117117
<script>
118-
require(['prototype'], function(){
119-
120-
$('<?= $block->escapeJs($_id) ?>').hide();
121-
$('<?= $block->escapeJs($_id) ?>').up().observe('mouseover', function(){$('<?= $block->escapeJs($_id) ?>').show();});
122-
$('<?= $block->escapeJs($_id) ?>').up().observe('mouseout', function(){$('<?= $block->escapeJs($_id) ?>').hide();});
123-
124-
});
125-
</script>
118+
require(['prototype'], function(){
119+
<?php $escapedId = $block->escapeJs($_id) ?>
120+
$('<?= $escapedId ?>').hide();
121+
$('<?= $escapedId ?>').up().observe('mouseover', function(){$('<?= $escapedId ?>').show();});
122+
$('<?= $escapedId ?>').up().observe('mouseout', function(){$('<?= $escapedId ?>').hide();});
123+
});
124+
</script>
126125
<?php endif;?>
127126
<?php endif;?>
128127
</dd>

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -183,14 +183,14 @@
183183
<?php if ($_remainder):?>
184184
... <span id="<?= $block->escapeHtmlAttr($_id = 'id' . uniqid()) ?>"><?= $block->escapeHtml($_remainder) ?></span>
185185
<script>
186-
require(['prototype'], function(){
186+
require(['prototype'], function(){
187+
<?php $escapedId = $block->escapeJs($_id) ?>
188+
$('<?= $escapedId ?>').hide();
189+
$('<?= $escapedId ?>').up().observe('mouseover', function(){$('<?= $escapedId?>').show();});
190+
$('<?= $escapedId ?>').up().observe('mouseout', function(){$('<?= $escapedId ?>').hide();});
187191

188-
$('<?= $block->escapeJs($_id) ?>').hide();
189-
$('<?= $block->escapeJs($_id) ?>').up().observe('mouseover', function(){$('<?= $block->escapeJs($_id)?>').show();});
190-
$('<?= $block->escapeJs($_id) ?>').up().observe('mouseout', function(){$('<?= $block->escapeJs($_id) ?>').hide();});
191-
192-
});
193-
</script>
192+
});
193+
</script>
194194
<?php endif;?>
195195
<?php endif;?>
196196
</dd>

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

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -116,14 +116,13 @@
116116
<?php if ($_remainder):?>
117117
... <span id="<?= $block->escapeHtmlAttr($_id = 'id' . uniqid()) ?>"><?= $block->escapeHtml($_remainder) ?></span>
118118
<script>
119-
require(['protoype'], function(){
120-
121-
$('<?= $block->escapeJs($_id) ?>').hide();
122-
$('<?= $block->escapeJs($_id) ?>').up().observe('mouseover', function(){$('<?= $block->escapeJs($_id) ?>').show();});
123-
$('<?= $block->escapeJs($_id) ?>').up().observe('mouseout', function(){$('<?= $block->escapeJs($_id) ?>').hide();});
124-
125-
});
126-
</script>
119+
require(['prototype'], function(){
120+
<?php $escapedId = $block->escapeJs($_id) ?>
121+
$('<?= $escapedId ?>').hide();
122+
$('<?= $escapedId ?>').up().observe('mouseover', function(){$('<?= $escapedId ?>').show();});
123+
$('<?= $escapedId ?>').up().observe('mouseout', function(){$('<?= $escapedId ?>').hide();});
124+
});
125+
</script>
127126
<?php endif;?>
128127
<?php endif;?>
129128
</dd>

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

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -185,14 +185,13 @@
185185
<?php if ($_remainder):?>
186186
... <span id="<?= $block->escapeHtmlAttr($_id = 'id' . uniqid()) ?>"><?= $block->escapeHtml($_remainder) ?></span>
187187
<script>
188-
require(['prototype'], function(){
189-
190-
$('<?= $block->escapeJs($_id) ?>').hide();
191-
$('<?= $block->escapeJs($_id) ?>').up().observe('mouseover', function(){$('<?= $block->escapeJs($_id) ?>').show();});
192-
$('<?= $block->escapeJs($_id) ?>').up().observe('mouseout', function(){$('<?= $block->escapeJs($_id) ?>').hide();});
193-
194-
});
195-
</script>
188+
require(['prototype'], function(){
189+
<?php $escapedId = $block->escapeJs($_id) ?>
190+
$('<?= $escapedId ?>').hide();
191+
$('<?= $escapedId ?>').up().observe('mouseover', function(){$('<?= $escapedId ?>').show();});
192+
$('<?= $escapedId ?>').up().observe('mouseout', function(){$('<?= $escapedId ?>').hide();});
193+
});
194+
</script>
196195
<?php endif;?>
197196
<?php endif;?>
198197
</dd>

‎app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/creditmemo/name.phtml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@
2323
<?php if ($_remainder):?>
2424
... <span id="<?= $block->escapeHtmlAttr($_id = 'id' . uniqid()) ?>"><?= $block->escapeHtml($_remainder) ?></span>
2525
<script>
26-
require(['prototype'], function(){
26+
require(['prototype'], function(){
27+
<?php $escapedId = $block->escapeJs($_id) ?>
28+
$('<?= $escapedId ?>').hide();
29+
$('<?= $escapedId ?>').up().observe('mouseover', function(){$('<?= $escapedId ?>').show();});
30+
$('<?= $escapedId ?>').up().observe('mouseout', function(){$('<?= $escapedId ?>').hide();});
2731

28-
$('<?= $block->escapeJs($_id) ?>').hide();
29-
$('<?= $block->escapeJs($_id) ?>').up().observe('mouseover', function(){$('<?= $block->escapeJs($_id) ?>').show();});
30-
$('<?= $block->escapeJs($_id) ?>').up().observe('mouseout', function(){$('<?= $block->escapeJs($_id) ?>').hide();});
31-
32-
});
33-
</script>
32+
});
33+
</script>
3434
<?php endif;?>
3535
<?php endif;?>
3636
</dd>

‎app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/invoice/name.phtml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,10 @@
2424
... <span id="<?= $block->escapeHtmlAttr($_id = 'id' . uniqid()) ?>"><?= $block->escapeHtml($_remainder) ?></span>
2525
<script>
2626
require(['prototype'], function(){
27-
28-
$('<?= $block->escapeJs($_id) ?>').hide();
29-
$('<?= $block->escapeJs($_id) ?>').up().observe('mouseover', function(){$('<?= $block->escapeJs($_id) ?>').show();});
30-
$('<?= $block->escapeJs($_id) ?>').up().observe('mouseout', function(){$('<?= $block->escapeJs($_id) ?>').hide();});
31-
27+
<?php $escapedId = $block->escapeJs($_id) ?>
28+
$('<?= $escapedId ?>').hide();
29+
$('<?= $escapedId ?>').up().observe('mouseover', function(){$('<?= $escapedId ?>').show();});
30+
$('<?= $escapedId ?>').up().observe('mouseout', function(){$('<?= $escapedId ?>').hide();});
3231
});
3332
</script>
3433
<?php endif;?>

‎app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/name.phtml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,10 @@
2727
... <span id="<?= $block->escapeHtmlAttr($_id = 'id' . uniqid()) ?>"><?= $block->escapeHtml($_remainder) ?></span>
2828
<script>
2929
require(['prototype'], function(){
30-
31-
$('<?= $block->escapeJs($_id) ?>').hide();
32-
$('<?= $block->escapeJs($_id) ?>').up().observe('mouseover', function(){$('<?= $block->escapeJs($_id) ?>').show();});
33-
$('<?= $block->escapeJs($_id) ?>').up().observe('mouseout', function(){$('<?= $block->escapeJs($_id) ?>').hide();});
34-
30+
<?php $escapedId = $block->escapeJs($_id) ?>
31+
$('<?= $escapedId ?>').hide();
32+
$('<?= $escapedId ?>').up().observe('mouseover', function(){$('<?= $escapedId ?>').show();});
33+
$('<?= $escapedId ?>').up().observe('mouseout', function(){$('<?= $escapedId ?>').hide();});
3534
});
3635
</script>
3736
<?php endif;?>

0 commit comments

Comments
 (0)