Merge remote-tracking branch 'origin/MAGETWO-83574' into 2.3-develop-pr5

zakdma · zakdma · commit 19cfcd2aa95a · 2018-03-16T18:29:06.000+02:00
diff --git a/app/code/Magento/Ui/view/base/web/js/form/components/html.js b/app/code/Magento/Ui/view/base/web/js/form/components/html.js
@@ -20,7 +20,10 @@ define([
             loading:        false,
             visible:        true,
             template:       'ui/content/content',
-            additionalClasses: {}
+            additionalClasses: {},
+            ignoreTmpls: {
+                content: true
+            }
         },
 
         /**
diff --git a/app/code/Magento/Ui/view/base/web/js/form/provider.js b/app/code/Magento/Ui/view/base/web/js/form/provider.js
@@ -21,6 +21,9 @@ define([
                     save: '${ $.submit_url }',
                     beforeSave: '${ $.validate_url }'
                 }
+            },
+            ignoreTmpls: {
+                data: true
             }
         },
 
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/provider.js b/app/code/Magento/Ui/view/base/web/js/grid/provider.js
@@ -31,6 +31,9 @@ define([
             listens: {
                 params: 'onParamsChange',
                 requestConfig: 'updateRequestConfig'
+            },
+            ignoreTmpls: {
+                data: true
             }
         },
 

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,9 @@ define([`
`31`	`31`	`listens: {`
`32`	`32`	`params: 'onParamsChange',`
`33`	`33`	`requestConfig: 'updateRequestConfig'`
	`34`	`+ },`
	`35`	`+ ignoreTmpls: {`
	`36`	`+ data: true`
`34`	`37`	`}`
`35`	`38`	`},`
`36`	`39`