MAGETWO-55928: Eliminate @escapeNotVerified in Widget Module

Joan He · Joan He · commit 9e83385392cf · 2016-08-18T12:18:47.000-05:00
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Widget/Chooser.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Widget/Chooser.php
@@ -121,7 +121,7 @@ function (node, e) {
                 }
             ';
         } else {
-            $chooserJsObject = $this->getId();
+            $chooserJsObject = $this->escapeJs($this->getId());
             $js = '
                 function (node, e) {
                     ' .
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Widget/Chooser.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Widget/Chooser.php
@@ -202,7 +202,7 @@ function (node, e) {
                 {jsObject}.categoryName = node.attributes.id != "none" ? node.text : false;
             }
         ';
-        $js = str_replace('{jsObject}', $this->getJsObjectName(), $js);
+        $js = str_replace('{jsObject}', $this->escapeJs($this->getJsObjectName()), $js);
         return $js;
     }
 
diff --git a/app/code/Magento/Widget/view/adminhtml/templates/catalog/category/widget/tree.phtml b/app/code/Magento/Widget/view/adminhtml/templates/catalog/category/widget/tree.phtml
@@ -44,7 +44,7 @@ Ext.extend(Ext.tree.TreePanel.Enhanced, Ext.tree.TreePanel, {
 
         if (firstLoad) {
             <?php if ($block->getNodeClickListener()): ?>
-                this.addListener('click', <?php echo $block->escapeHtml($block->getNodeClickListener()) ?>.createDelegate(this));
+                this.addListener('click', <?php /* @noEscape */ echo $block->getNodeClickListener() ?>.createDelegate(this));
             <?php endif; ?>
         }
 

Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ function (node, e) {`
`121`	`121`	`}`
`122`	`122`	`';`
`123`	`123`	`} else {`
`124`		`- $chooserJsObject = $this->getId();`
	`124`	`+ $chooserJsObject = $this->escapeJs($this->getId());`
`125`	`125`	`$js = '`
`126`	`126`	`function (node, e) {`
`127`	`127`	`' .`
Original file line number	Diff line number	Diff line change
`@@ -202,7 +202,7 @@ function (node, e) {`
`202`	`202`	`{jsObject}.categoryName = node.attributes.id != "none" ? node.text : false;`
`203`	`203`	`}`
`204`	`204`	`';`
`205`		`- $js = str_replace('{jsObject}', $this->getJsObjectName(), $js);`
	`205`	`+ $js = str_replace('{jsObject}', $this->escapeJs($this->getJsObjectName()), $js);`
`206`	`206`	`return $js;`
`207`	`207`	`}`
`208`	`208`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ Ext.extend(Ext.tree.TreePanel.Enhanced, Ext.tree.TreePanel, {`
`44`	`44`
`45`	`45`	`if (firstLoad) {`
`46`	`46`	`<?php if ($block->getNodeClickListener()): ?>`
`47`		`- this.addListener('click', <?php echo $block->escapeHtml($block->getNodeClickListener()) ?>.createDelegate(this));`
	`47`	`+ this.addListener('click', <?php /* @noEscape */ echo $block->getNodeClickListener() ?>.createDelegate(this));`
`48`	`48`	`<?php endif; ?>`
`49`	`49`	`}`
`50`	`50`