Skip to content

Chore: Widget - Replace Block Escaping with Escaper #37043

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Chore: Widget - Replace Block Escaping with Escaper #37043

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 18 additions & 12 deletions app/code/Magento/Widget/view/adminhtml/templates/catalog/category/widget/tree.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,19 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
declare(strict_types=1);

/** @var \Magento\Catalog\Block\Adminhtml\Category\Widget\Chooser $block */
/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
use Magento\Catalog\Block\Adminhtml\Category\Widget\Chooser;
use Magento\Framework\Escaper;
use Magento\Framework\View\Helper\SecureHtmlRenderer;

/** @var Escaper $escaper */
/** @var Chooser $block */
/** @var SecureHtmlRenderer $secureRenderer */
?>

<?php $_divId = 'tree' . $block->getId() ?>
<div id="<?= $block->escapeHtmlAttr($_divId) ?>" class="tree"></div>
<div id="<?= $escaper->escapeHtmlAttr($_divId) ?>" class="tree"></div>
<?php
$useMassaction = /* @noEscape */ $block->getUseMassaction() ? 1 : 0;
$isAnchorOnly = /* @noEscape */ $block->getIsAnchorOnly() ? 1 : 0;
Expand All @@ -24,7 +30,7 @@ $scriptString = <<<script

require(['jquery', "prototype", "extjs/ext-tree-checkbox"], function(jQuery){

var tree{$block->escapeJs($block->getId())};
var tree{$escaper->escapeJs($block->getId())};

var useMassaction = {$useMassaction};

Expand Down Expand Up @@ -77,7 +83,7 @@ jQuery(function()
var emptyNodeAdded = {$withEmpltyNode};

var categoryLoader = new Ext.tree.TreeLoader({
dataUrl: '{$block->escapeJs($block->getLoadTreeUrl())}'
dataUrl: '{$escaper->escapeJs($block->getLoadTreeUrl())}'
});

categoryLoader.buildCategoryTree = function(parent, config)
Expand All @@ -96,7 +102,7 @@ jQuery(function()
// Add empty node to reset category filter
if(!emptyNodeAdded) {
var empty = Object.clone(_node);
empty.text = '{$block->escapeJs($block->escapeHtml(__('None')))}';
empty.text = '{$escaper->escapeJs($escaper->escapeHtml(__('None')))}';
empty.children = [];
empty.id = 'none';
empty.path = '1/none';
Expand Down Expand Up @@ -167,11 +173,11 @@ jQuery(function()
};

categoryLoader.on("beforeload", function(treeLoader, node) {
$('{$block->escapeJs($_divId)}').fire('category:beforeLoad', {treeLoader:treeLoader});
$('{$escaper->escapeJs($_divId)}').fire('category:beforeLoad', {treeLoader:treeLoader});
treeLoader.baseParams.id = node.attributes.id;
});

tree{$block->escapeJs($block->getId())} = new Ext.tree.TreePanel.Enhanced('{$block->escapeJs($_divId)}', {
tree{$escaper->escapeJs($block->getId())} = new Ext.tree.TreePanel.Enhanced('{$escaper->escapeJs($_divId)}', {
animate: false,
loader: categoryLoader,
enableDD: false,
Expand All @@ -183,9 +189,9 @@ jQuery(function()
});

if (useMassaction) {
tree{$block->escapeJs($block->getId())}.on('check', function(node) {
$('{$block->escapeJs($_divId)}').fire('node:changed', {node:node});
}, tree{$block->escapeJs($block->getId())});
tree{$escaper->escapeJs($block->getId())}.on('check', function(node) {
$('{$escaper->escapeJs($_divId)}').fire('node:changed', {node:node});
}, tree{$escaper->escapeJs($block->getId())});
}

// set the root node
Expand All @@ -197,7 +203,7 @@ jQuery(function()
category_id: {$categoryId}
};

tree{$block->escapeJs($block->getId())}.loadTree({parameters:parameters, data:{$treeJson}},true);
tree{$escaper->escapeJs($block->getId())}.loadTree({parameters:parameters, data:{$treeJson}},true);

});

Expand Down