Merge remote-tracking branch 'origin/AC-12128' into Hammer_248beta1_Scope03072024

glo71317 · glo71317 · commit 35278d55041c · 2024-07-03T19:28:52.000+05:30
diff --git a/dev/tests/static/testsuite/Magento/Test/Js/_files/blacklist/magento.txt b/dev/tests/static/testsuite/Magento/Test/Js/_files/blacklist/magento.txt
@@ -14,9 +14,11 @@ lib/web/magnifier/magnifier.js
 lib/web/magnifier/magnify.js
 lib/web/varien/js.js
 lib/web/jquery/jquery.validate.js
+lib/web/prototype/**/*.js
 
 // MINIFIED FILES
 app/code/**/*.min.js
+lib/web/legacy-build.min.js
 
 // TEST
 vendor/magento/magento-coding-standard/Magento2/Tests/Eslint/*
diff --git a/lib/web/legacy-build.min.js b/lib/web/legacy-build.min.js
diff --git a/lib/web/prototype/prototype.js b/lib/web/prototype/prototype.js
@@ -643,7 +643,7 @@ Object.extend(String.prototype, (function () {
   }
 
   function stripTags() {
-    return this.replace(/<\w+(\s+("[^"]*"|'[^']*'|[^>])+)?(\/)?>|<\/\w+>/gi, '');
+    return this.replace(/<\w+(\s+("[^"]*"|'[^']*'|[^>'"])+)?\s*("[^">]*|'[^'>])?(\/)?>|<\/\w+>/gi, '');
   }
 
   function stripScripts() {

Original file line number	Diff line number	Diff line change
`@@ -643,7 +643,7 @@ Object.extend(String.prototype, (function () {`
`643`	`643`	`}`
`644`	`644`
`645`	`645`	`function stripTags() {`
`646`		`- return this.replace(/<\w+(\s+("[^"]"\|'[^']'\|[^>])+)?(\/)?>\|<\/\w+>/gi, '');`
	`646`	`+ return this.replace(/<\w+(\s+("[^"]"\|'[^']'\|[^>'"])+)?\s("[^">]\|'[^'>])?(\/)?>\|<\/\w+>/gi, '');`
`647`	`647`	`}`
`648`	`648`
`649`	`649`	`function stripScripts() {`