Skip to content

Commit 1edf224

Browse files
svitjasvitja
committed
MC-29420: Remove event handlers from CE
1 parent 39a6e2b commit 1edf224

File tree

5 files changed

+73
-41
lines changed

5 files changed

+73
-41
lines changed

‎app/code/Magento/ImportExport/view/adminhtml/templates/export/form/after.phtml

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,11 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
7+
/** @var \Magento\ImportExport\Block\Adminhtml\Form\After $block */
8+
/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
69
?>
7-
<fieldset class="admin__fieldset" id="export_filter_container" style="display:none;">
10+
<fieldset class="admin__fieldset" id="export_filter_container">
811
<legend class="admin__legend">
912
<span><?= $block->escapeHtml(__('Entity Attributes')) ?></span>
1013
</legend>
@@ -13,16 +16,24 @@
1316
<input name="form_key" type="hidden" value="<?= /* @noEscape */ $block->getFormKey() ?>" />
1417
<div id="export_filter_grid_container"><!-- --></div>
1518
</form>
16-
<button class="action- scalable" type="button" onclick="getFile();"><span><?=
17-
$block->escapeHtml(__('Continue'))
18-
?></span></button>
19+
<button class="action- scalable" type="button">
20+
<span><?= $block->escapeHtml(__('Continue')) ?></span>
21+
</button>
1922
</fieldset>
20-
<script>
23+
<?= /* @noEscape */ $secureRenderer->renderStyleAsTag("display:none;", 'fieldset#export_filter_container') ?>
24+
<?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
25+
'onclick',
26+
"getFile();",
27+
'fieldset#export_filter_container button'
28+
) ?>
29+
<?php $scriptString = <<<script
2130
require(['prototype'], function(){
2231
2332
//<![CDATA[
2433
$('entity').selectedIndex = 0; // forced resetting entity selector after page refresh
2534
//]]>
2635
2736
});
28-
</script>
37+
script;
38+
?>
39+
<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>

‎app/code/Magento/ImportExport/view/adminhtml/templates/export/form/before.phtml

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,12 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
7+
/** @var \Magento\Backend\Block\Template $block */
8+
/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
69
?>
7-
<script>
10+
11+
<?php $scriptString = <<<script
812
require([
913
'Magento_Ui/js/modal/alert',
1014
'prototype'
@@ -26,14 +30,14 @@ require([
2630
* Handle value change in entity type selector
2731
*/
2832
modifyFilterGrid: function() {
29-
if ($('entity') && $F('entity') && $F('entity') != 'catalog_product') {
30-
$$('col:first-child').each(function(el) {
33+
if ($('entity') && \$F('entity') && \$F('entity') != 'catalog_product') {
34+
\$$('col:first-child').each(function(el) {
3135
el.show();
3236
});
33-
$$('th.no-link:first-child').each(function(el) {
37+
\$$('th.no-link:first-child').each(function(el) {
3438
el.show();
3539
});
36-
$$('td.a-center').each(function(el) {
40+
\$$('td.a-center').each(function(el) {
3741
el.show();
3842
});
3943
}
@@ -43,9 +47,9 @@ require([
4347
* Post form data and process response via AJAX
4448
*/
4549
getFilter: function() {
46-
if ($('entity') && $F('entity')) {
47-
var url = "<?= $block->escapeJs($block->escapeUrl($block->getUrl('*/*/getFilter'))) ?>";
48-
var entity = $F('entity');
50+
if ($('entity') && \$F('entity')) {
51+
var url = "{$block->escapeJs($block->getUrl('*/*/getFilter'))}";
52+
var entity = \$F('entity');
4953
if (entity != this.previousGridEntity) {
5054
this.previousGridEntity = entity;
5155
url += ((url.slice(-1) != '/') ? '/' : '') + 'entity/' + entity;
@@ -76,20 +80,20 @@ require([
7680
* return void
7781
*/
7882
getFile = function() {
79-
if ($('entity') && $F('entity')) {
83+
if ($('entity') && \$F('entity')) {
8084
var form = $('export_filter_form');
8185
var oldAction = form.action;
82-
var url = oldAction + ((oldAction.slice(-1) != '/') ? '/' : '') + 'entity/' + $F('entity')
83-
+ '/file_format/' + $F('file_format');
84-
if ($F('fields_enclosure')) {
85-
url += '/fields_enclosure/' + $F('fields_enclosure');
86+
var url = oldAction + ((oldAction.slice(-1) != '/') ? '/' : '') + 'entity/' + \$F('entity')
87+
+ '/file_format/' + \$F('file_format');
88+
if (\$F('fields_enclosure')) {
89+
url += '/fields_enclosure/' + \$F('fields_enclosure');
8690
}
8791
form.action = url;
8892
form.submit();
8993
form.action = oldAction;
9094
} else {
9195
alert({
92-
content: '<?= $block->escapeHtml(__('Invalid data')); ?>'
96+
content: '{$block->escapeHtml(__('Invalid data'))}'
9397
});
9498
}
9599
};
@@ -98,4 +102,6 @@ require([
98102
//]]>
99103
100104
});
101-
</script>
105+
script;
106+
?>
107+
<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>

‎app/code/Magento/ImportExport/view/adminhtml/templates/export/form/filter/after.phtml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,12 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
7+
/** @var \Magento\Backend\Block\Template $block */
8+
/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
69
?>
7-
<script>
10+
11+
<?php $scriptString = <<<script
812
require([
913
'mage/adminhtml/grid'
1014
], function(){
@@ -17,4 +21,6 @@ require([
1721
};
1822
}
1923
});
20-
</script>
24+
script;
25+
?>
26+
<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>

‎app/code/Magento/ImportExport/view/adminhtml/templates/import/form/after.phtml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,26 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
7+
/** @var \Magento\ImportExport\Block\Adminhtml\Form\After $block */
8+
/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
69
?>
7-
<div class="entry-edit fieldset" id="import_validation_container" style="display:none;">
10+
11+
<div class="entry-edit fieldset" id="import_validation_container">
812
<div class="entry-edit-head legend">
913
<span class="icon-head head-edit-form fieldset-legend"
1014
id="import_validation_container_header"><?= $block->escapeHtml(__('Validation Results')) ?></span>
1115
</div><br>
1216
<div id="import_validation_messages" class="fieldset"><!-- --></div>
1317
</div>
14-
<script>
18+
<?= /* @noEscape */ $secureRenderer->renderStyleAsTag("display:none;", 'div#import_validation_container') ?>
19+
<?php $scriptString = <<<script
1520
require(['jquery', 'Magento_Ui/js/modal/alert', 'prototype'], function(jQuery){
1621
//<![CDATA[
1722
varienImport.resetSelectIndex('entity'); // forced resetting entity selector after page refresh
1823
//]]>
1924
2025
});
21-
</script>
26+
script;
27+
?>
28+
<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>

‎app/code/Magento/ImportExport/view/adminhtml/templates/import/form/before.phtml

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@
66
?>
77
<?php
88
/** @var $block \Magento\ImportExport\Block\Adminhtml\Import\Edit\Before */
9+
/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
910
?>
10-
<script>
11+
12+
<?php $scriptString = <<<script
1113
require([
1214
'jquery',
1315
'Magento_Ui/js/modal/alert',
@@ -27,27 +29,25 @@ require([
2729
* List of existing behavior sets
2830
* @type {Array}
2931
*/
30-
uniqueBehaviors: <?= /* @noEscape */ $block->getUniqueBehaviors() ?>,
32+
uniqueBehaviors: {$block->getUniqueBehaviors()},
3133
3234
/**
3335
* Behaviour codes for import entities
3436
* @type {Array}
3537
*/
36-
entityBehaviors: <?= /* @noEscape */ $block->getEntityBehaviors() ?>,
38+
entityBehaviors: {$block->getEntityBehaviors()},
3739
3840
/**
3941
* Behaviour notes for import entities
4042
* @type {Array}
4143
*/
42-
entityBehaviorsNotes: <?= /* @noEscape */ $block->getEntityBehaviorsNotes() ?>,
44+
entityBehaviorsNotes: {$block->getEntityBehaviorsNotes()},
4345
4446
/**
4547
* Base url
4648
* @type {string}
4749
*/
48-
sampleFilesBaseUrl: '<?= $block->escapeJs(
49-
$block->escapeUrl($block->getUrl('*/*/download/', ['filename' => 'entity-name']))
50-
) ?>',
50+
sampleFilesBaseUrl: '{$block->escapeJs($block->getUrl('*/*/download/', ['filename' => 'entity-name']))}',
5151
5252
/**
5353
* Reset selected index
@@ -168,8 +168,8 @@ require([
168168
*/
169169
postToFrame: function(newActionUrl) {
170170
if (!jQuery('[name="' + this.ifrElemName + '"]').length) {
171-
jQuery('body').append('<iframe name="' + this.ifrElemName + '" id="' + this.ifrElemName
172-
+ '" style="display:none;"/>');
171+
jQuery('body').append('<iframe name="' + this.ifrElemName + '" id="' + this.ifrElemName + '"/>');
172+
jQuery('iframe#' + this.ifrElemName).attr('display', 'none');
173173
}
174174
jQuery('body')
175175
.loader({
@@ -209,25 +209,25 @@ require([
209209
postToFrameProcessResponse: function(response) {
210210
if ('object' != typeof(response)) {
211211
alert({
212-
content: '<?= $block->escapeHtml(__('Invalid response')); ?>'
212+
content: '{$block->escapeHtml(__('Invalid response'))}'
213213
});
214214
215215
return false;
216216
}
217-
$H(response).each(function(pair) {
217+
\$H(response).each(function(pair) {
218218
switch (pair.key) {
219219
case 'show':
220220
case 'clear':
221221
case 'hide':
222-
$H(pair.value).each(function(val) {
222+
\$H(pair.value).each(function(val) {
223223
if ($(val.value)) {
224224
$(val.value)[pair.key]();
225225
}
226226
});
227227
break;
228228
case 'innerHTML':
229229
case 'value':
230-
$H(pair.value).each(function(val) {
230+
\$H(pair.value).each(function(val) {
231231
var el = $(val.key);
232232
if (el) {
233233
el[pair.key] = val.value;
@@ -238,7 +238,7 @@ require([
238238
break;
239239
case 'removeClassName':
240240
case 'addClassName':
241-
$H(pair.value).each(function(val) {
241+
\$H(pair.value).each(function(val) {
242242
if ($(val.key)) $(val.key)[pair.key](val.value);
243243
});
244244
break;
@@ -265,4 +265,6 @@ require([
265265
//]]>
266266
267267
});
268-
</script>
268+
script;
269+
?>
270+
<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>

0 commit comments

Comments
 (0)