Skip to content

Commit 3ed3bfc

Browse files
authored
Merge pull request #5810 from magento-tsg/2.4.0-develop-pr58
[TSG] Fixes for 2.4 (pr58) (2.4.0-develop)
2 parents d23e179 + 14d1111 commit 3ed3bfc

File tree

3 files changed

+22
-10
lines changed

3 files changed

+22
-10
lines changed

app/code/Magento/Backend/view/adminhtml/templates/widget/tabs.phtml

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<?php $_tabHref = $block->getTabUrl($_tab) == '#' ? '#' . $block->getTabId($_tab) . '_content' :
3232
$block->getTabUrl($_tab) ?>
3333

34-
<li class="admin__page-nav-item" id="<?= $block->escapeHtmlAttr($block->getTabId($_tab)) ?>"
34+
<li class="admin__page-nav-item no-display" id="<?= $block->escapeHtmlAttr($block->getTabId($_tab)) ?>"
3535
<?= /* @noEscape */ $block->getUiId('tab', 'item', $_tab->getId()) ?>>
3636
<a href="<?= $block->escapeUrl($_tabHref) ?>"
3737
id="<?= $block->escapeHtmlAttr($block->getTabId($_tab)) ?>"
@@ -72,17 +72,27 @@
7272
<?= /* @noEscape */ $block->getUiId('tab', 'content', $_tab->getId()) ?>>
7373
<?= /* @noEscape */ $block->getTabContent($_tab) ?>
7474
</div>
75-
<?php if ($block->getTabIsHidden($_tab)): ?>
76-
<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
77-
'display:none',
78-
'li.admin__page-nav-item#' . $block->escapeJs($block->getTabId($_tab))
79-
); ?>
80-
<?php endif; ?>
8175
<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
8276
'display:none',
8377
'div#' . $block->escapeJs($block->getTabId($_tab)) . '_content'
8478
); ?>
8579
</li>
80+
<?php $scriptString = <<<script
81+
require(['jquery'], function($){
82+
'use strict';
83+
script;
84+
if ($block->getTabIsHidden($_tab)):
85+
$scriptString .= <<<script
86+
$('li.admin__page-nav-item#{$block->escapeJs($block->getTabId($_tab))}').css('display', 'none');
87+
script;
88+
endif;
89+
90+
$scriptString .= <<<script
91+
$('li.admin__page-nav-item#{$block->escapeJs($block->getTabId($_tab))}').removeClass('no-display');
92+
})
93+
script;
94+
?>
95+
<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
8696
<?php endforeach; ?>
8797
</ul>
8898
</div>

app/code/Magento/Checkout/view/frontend/templates/total/default.phtml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,7 @@ $checkoutHelper = $block->getData('checkoutHelper');
3939
<?php endif; ?>
4040
</td>
4141
</tr>
42-
<?= /* @noEscape */ $secureRenderer->renderStyleAsTag($block->getTotal()->getStyle(), 'tr.totals th.mark') ?>
43-
<?= /* @noEscape */ $secureRenderer->renderStyleAsTag($block->getTotal()->getStyle(), 'tr.totals td.amount') ?>
42+
<?php if ($block->getTotal()->getStyle()): ?>
43+
<?= /* @noEscape */ $secureRenderer->renderStyleAsTag($block->getTotal()->getStyle(), 'tr.totals th.mark') ?>
44+
<?= /* @noEscape */ $secureRenderer->renderStyleAsTag($block->getTotal()->getStyle(), 'tr.totals td.amount') ?>
45+
<?php endif; ?>

app/code/Magento/Customer/view/frontend/templates/account/authentication-popup.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
?>
1010
<div id="authenticationPopup" data-bind="scope:'authenticationPopup', style: {display: 'none'}">
1111
<?php $scriptString = 'window.authenticationPopup = ' . /* @noEscape */ $block->getSerializedConfig(); ?>
12-
<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false); ?>;
12+
<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false); ?>
1313
<!-- ko template: getTemplate() --><!-- /ko -->
1414
<script type="text/x-magento-init">
1515
{

0 commit comments

Comments
 (0)