Merge branch 'release/3.402.0'

VirtoCommerce · Oct 23, 2023 · dd30a9b · dd30a9b
2 parents d7c956f + 2cf0721
commit dd30a9b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -2,7 +2,7 @@
 <Project>
   <!-- These properties will be shared for all projects -->
   <PropertyGroup>
-    <VersionPrefix>3.401.0</VersionPrefix>
+    <VersionPrefix>3.402.0</VersionPrefix>
     <VersionSuffix>
     </VersionSuffix>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>

diff --git a/src/VirtoCommerce.CoreModule.Web/Scripts/common/directives/uikit-htmleditor.js b/src/VirtoCommerce.CoreModule.Web/Scripts/common/directives/uikit-htmleditor.js
@@ -11,7 +11,8 @@ angular.module('virtoCommerce.coreModule.common').directive('vcUkHtmleditor', [f
             var htmlEditor = UIkit.htmleditor(element, { mode: 'split', maxsplitsize: 1000, markdown: true, enablescripts: false, iframe: true });
             var codeMirror = htmlEditor.editor;
             //Besides inline scripts need to also eliminate inline event handlers on preview
-            htmlEditor.on('render', function () {
+            htmlEditor.on('render', function (event, uiEditor) {
+                uiEditor.currentvalue = uiEditor.currentvalue.replace(/<(script|style)\b[^<]*(?:(?!<\/(script|style))<[^<]*)*<\/(script|style)[>\s]/img, '');
                 htmlEditor.replaceInPreview(/(?:<[^>]+\s)((on\S+)=["']?((?:.(?!["']?\s+(?:\S+)=|[>"']))+.)["']?)/ig, eventReplacer);
             });
             htmlEditor.addButtons({

diff --git a/src/VirtoCommerce.CoreModule.Web/module.manifest b/src/VirtoCommerce.CoreModule.Web/module.manifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <id>VirtoCommerce.Core</id>
-  <version>3.401.0</version>
+  <version>3.402.0</version>
   <version-tag />
   <platformVersion>3.429.0</platformVersion>
   <title>Commerce core module</title>