Skip to content

Commit 292de1d

Browse files
author
Denys Rul
committed
MAGETWO-33932: Add ability to initialize modules by selector
- Change data-mage-init format for ui components
1 parent f2737c7 commit 292de1d

File tree

7 files changed

+47
-26
lines changed

7 files changed

+47
-26
lines changed

‎app/code/Magento/Ui/view/base/templates/filter_pool/default.phtml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,12 @@
77
* @var \Magento\Ui\Component\FilterPool $block
88
*/
99
?>
10-
<script data-mage-init='{"Magento_Ui/js/listing/filter": ""}' type="application/json">
11-
<?php echo $block->getConfigBuilder()->toJson($block->getConfig()); ?>
10+
<script type="text/x-magento-init">
11+
{
12+
"*": {
13+
"Magento_Ui/js/listing/filter": <?php echo $block->getConfigBuilder()->toJson($block->getConfig()); ?>
14+
}
15+
}
1216
</script>
1317
<div data-bind="scope: '<?php echo $block->getParentName(); ?>:<?php echo $block->getName(); ?>'">
1418
<!-- ko template: 'ui/filter' --><!-- /ko -->

‎app/code/Magento/Ui/view/base/templates/form/default.phtml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,12 @@
77
* @var \Magento\Ui\Component\Form $block
88
*/
99
?>
10-
<script data-mage-init='{ "Magento_Ui/js/core/app": "" }' type="application/json">
11-
<?php echo $block->getRenderContext()->getConfigBuilder()->toJsonNew($block->getRenderContext()->getStorage()); ?>
10+
<script type="text/x-magento-init">
11+
{
12+
"*": {
13+
"Magento_Ui/js/core/app": <?php echo $block->getRenderContext()->getConfigBuilder()->toJsonNew($block->getRenderContext()->getStorage()); ?>
14+
}
15+
}
1216
</script>
1317
<div data-role="spinner" data-component="<?php echo $block->getDataScope(); ?>.areas" class="grid-loading-mask">
1418
<div class="grid-loader"></div>

‎app/code/Magento/Ui/view/base/templates/listing/horizontal_grid.phtml

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,17 @@
99
* @var \Magento\Ui\Component\Listing $block
1010
*/
1111
?>
12-
<script>
13-
var allowLocalCache = true;
14-
</script>
15-
<script data-mage-init='{"Magento_Ui/js/lib/provider": ""}' type="application/json">
16-
<?php
17-
echo $block->getRenderContext()
18-
->getConfigBuilder()
19-
->toJson($block->getRenderContext()->getStorage(), $block->getName());
20-
?>
21-
</script>
22-
<script data-mage-init='{"Magento_Ui/js/listing/grid": ""}' type="application/json">
23-
<?php echo $block->getConfigBuilder()->toJson($block->getConfig()); ?>
12+
<script type="text/x-magento-init">
13+
{
14+
"*": {
15+
"Magento_Ui/js/lib/provider":
16+
<?php echo $block->getRenderContext()
17+
->getConfigBuilder()
18+
->toJson($block->getRenderContext()->getStorage(), $block->getName());
19+
?>,
20+
"Magento_Ui/js/listing/grid": <?php echo $block->getConfigBuilder()->toJson($block->getConfig()); ?>
21+
}
22+
}
2423
</script>
2524
<?php echo $block->getChildHtml('listing_head'); ?>
2625
<div class="grid">

‎app/code/Magento/Ui/view/base/templates/listingcontainer/massaction/default.phtml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,12 @@
99
* @var \Magento\Ui\Component\MassAction $block
1010
*/
1111
?>
12-
13-
<script data-mage-init='{ "Magento_Ui/js/listing/massaction": "" }' type="application/json">
14-
<?php echo $block->getConfigBuilder()->toJson($block->getConfig()); ?>
12+
<script type="text/x-magento-init">
13+
{
14+
"*": {
15+
"Magento_Ui/js/listing/massaction": <?php echo $block->getConfigBuilder()->toJson($block->getConfig()); ?>
16+
}
17+
}
1518
</script>
1619
<div data-bind="scope: '<?php echo $block->getParentName(); ?>:<?php echo $block->getName(); ?>'" class="grid-actions">
1720
<!-- ko template: 'ui/massaction' --><!-- /ko -->

‎app/code/Magento/Ui/view/base/templates/listingcontainer/massaction/page_actions.phtml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,12 @@
99
* @var \Magento\Ui\Component\MassAction $block
1010
*/
1111
?>
12-
<script data-mage-init='{ "Magento_Ui/js/listing/massaction": "" }' type="application/json">
13-
<?php echo $block->getConfigBuilder()->toJson($block->getConfig()); ?>
12+
<script type="text/x-magento-init">
13+
{
14+
"*": {
15+
"Magento_Ui/js/listing/massaction": <?php echo $block->getConfigBuilder()->toJson($block->getConfig()); ?>
16+
}
17+
}
1418
</script>
1519
<div data-bind="scope: '<?php echo $block->getParentName(); ?>:<?php echo $block->getName(); ?>'">
1620
<!-- ko template: 'ui/pageactions' --><!-- /ko -->

‎app/code/Magento/Ui/view/base/templates/paging/default.phtml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,12 @@
99
* @var \Magento\Ui\Component\Paging $block
1010
*/
1111
?>
12-
<script data-mage-init='{"Magento_Ui/js/listing/paging" : ""}' type="application/json">
13-
<?php echo $block->getConfigBuilder()->toJson($block->getConfig()); ?>
12+
<script type="text/x-magento-init">
13+
{
14+
"*": {
15+
"Magento_Ui/js/listing/paging": <?php echo $block->getConfigBuilder()->toJson($block->getConfig()); ?>
16+
}
17+
}
1418
</script>
1519
<div data-bind="scope: '<?php echo $block->getParentName(); ?>:<?php echo $block->getName(); ?>'" class="pager">
1620
<!-- ko template: 'ui/pagination' --><!-- /ko -->

‎app/code/Magento/Ui/view/base/templates/sorting/default.phtml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@
1010
*/
1111

1212
?>
13-
14-
<script data-mage-init='{ "Magento_Ui/js/listing/sorting": "" }' type="application/json">
15-
<?php echo $block->getConfigBuilder()->toJson($block->getConfig()); ?>
13+
<script type="text/x-magento-init">
14+
{
15+
"*": {
16+
"Magento_Ui/js/listing/sorting": <?php echo $block->getConfigBuilder()->toJson($block->getConfig()); ?>
17+
}
18+
}
1619
</script>

0 commit comments

Comments
 (0)