MAGETWO-56444: UI-Related Modules Template Update

Hwashiang Yu · Hwashiang Yu · commit 4ebdefa81b8e · 2019-05-01T16:07:49.000-05:00
- Corrected theme and ui module templates
diff --git a/app/code/Magento/Theme/view/base/templates/root.phtml b/app/code/Magento/Theme/view/base/templates/root.phtml
@@ -6,13 +6,13 @@
 
 ?>
 <!doctype html>
-<html <?= $block->escapeHtmlAttr($htmlAttributes) ?>>
-    <head <?= $block->escapeHtmlAttr($headAttributes) ?>>
-        <?= $block->escapeHtml($requireJs) ?>
-        <?= $block->escapeHtml($headContent) ?>
-        <?= $block->escapeHtml($headAdditional) ?>
+<html <?= /* @noEscape */ $htmlAttributes ?>>
+    <head <?= /* @noEscape */ $headAttributes ?>>
+        <?= /* @noEscape */ $requireJs ?>
+        <?= /* @noEscape */ $headContent ?>
+        <?= /* @noEscape */ $headAdditional ?>
     </head>
-    <body data-container="body" data-mage-init='{"loaderAjax": {}, "loader": { "icon": "<?= $block->escapeHtmlAttr($loaderIcon) ?>"}}' <?= $block->escapeHtmlAttr($bodyAttributes) ?>>
-        <?= $block->escapeHtml($layoutContent) ?>
+    <body data-container="body" data-mage-init='{"loaderAjax": {}, "loader": { "icon": "<?= /* @noEscape */ $loaderIcon ?>"}}' <?= /* @noEscape */ $bodyAttributes ?>>
+        <?= /* @noEscape */ $layoutContent ?>
     </body>
 </html>
diff --git a/app/code/Magento/Ui/view/base/templates/stepswizard.phtml b/app/code/Magento/Ui/view/base/templates/stepswizard.phtml
@@ -6,7 +6,7 @@
 
 /** @var $block \Magento\Ui\Block\Component\StepsWizard */
 ?>
-<div data-role="steps-wizard-main" class="steps-wizard <?= $block->escapeHtmlAttr($block->getData('config/dataScope')) ?>" data-bind="scope: '<?= $block->escapeHtmlAttr($block->getComponentName()) ?>'">
+<div data-role="steps-wizard-main" class="steps-wizard <?= /* @noEscape */ $block->getData('config/dataScope') ?>" data-bind="scope: '<?= $block->escapeHtmlAttr($block->getComponentName()) ?>'">
     <div data-role="messages" class="messages"></div>
 
     <div data-role="steps-wizard-controls" class="steps-wizard-navigation">
@@ -62,7 +62,7 @@
                             "component": "Magento_Ui/js/lib/step-wizard",
                             "initData": <?= $block->escapeJs($this->helper("Magento\Framework\Json\Helper\Data")->jsonEncode($block->getInitData())) ?>,
                             "stepsNames": <?= $block->escapeJs($this->helper("Magento\Framework\Json\Helper\Data")->jsonEncode($block->getStepComponents())) ?>,
-                            "modalClass": "<?= $block->escapeJs($block->getData('config/dataScope')) ?>"
+                            "modalClass": "<?=  /* @noEscape */ $block->getData('config/dataScope') ?>"
                         }
                     }
                 }
diff --git a/app/code/Magento/Ui/view/base/templates/wysiwyg/active_editor.phtml b/app/code/Magento/Ui/view/base/templates/wysiwyg/active_editor.phtml
@@ -10,7 +10,7 @@
     require.config({
         map: {
             '*': {
-                wysiwygAdapter: '<?= $block->escapeJs($block->getWysiwygAdapterPath()) ?>'
+                wysiwygAdapter: '<?= /* @noEscape */ $block->getWysiwygAdapterPath() ?>'
             }
         }
     });

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`/** @var $block \Magento\Ui\Block\Component\StepsWizard */`
`8`	`8`	`?>`
`9`		`-<div data-role="steps-wizard-main" class="steps-wizard <?= $block->escapeHtmlAttr($block->getData('config/dataScope')) ?>" data-bind="scope: '<?= $block->escapeHtmlAttr($block->getComponentName()) ?>'">`
	`9`	`+<div data-role="steps-wizard-main" class="steps-wizard <?= /* @noEscape */ $block->getData('config/dataScope') ?>" data-bind="scope: '<?= $block->escapeHtmlAttr($block->getComponentName()) ?>'">`
`10`	`10`	`<div data-role="messages" class="messages"></div>`
`11`	`11`
`12`	`12`	`<div data-role="steps-wizard-controls" class="steps-wizard-navigation">`
`@@ -62,7 +62,7 @@`
`62`	`62`	`"component": "Magento_Ui/js/lib/step-wizard",`
`63`	`63`	`"initData": <?= $block->escapeJs($this->helper("Magento\Framework\Json\Helper\Data")->jsonEncode($block->getInitData())) ?>,`
`64`	`64`	`"stepsNames": <?= $block->escapeJs($this->helper("Magento\Framework\Json\Helper\Data")->jsonEncode($block->getStepComponents())) ?>,`
`65`		`- "modalClass": "<?= $block->escapeJs($block->getData('config/dataScope')) ?>"`
	`65`	`+ "modalClass": "<?= /* @noEscape */ $block->getData('config/dataScope') ?>"`
`66`	`66`	`}`
`67`	`67`	`}`
`68`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`require.config({`
`11`	`11`	`map: {`
`12`	`12`	`'*': {`
`13`		`- wysiwygAdapter: '<?= $block->escapeJs($block->getWysiwygAdapterPath()) ?>'`
	`13`	`+ wysiwygAdapter: '<?= /* @noEscape */ $block->getWysiwygAdapterPath() ?>'`
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`	`});`