Fixing conflict

dotCMS · Mar 15, 2023 · bda58d5 · bda58d5
2 parents 57dca55 + c7b4a18
commit bda58d5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/dotCMS/src/main/webapp/html/portlet/ext/contentlet/field/edit_field.jsp b/dotCMS/src/main/webapp/html/portlet/ext/contentlet/field/edit_field.jsp
@@ -37,7 +37,7 @@
 <%@ page import="com.dotcms.contenttype.model.field.HostFolderField" %>
 <%@ page import="com.dotmarketing.beans.Host" %>
 <%@ page import="com.dotcms.contenttype.model.field.JSONField" %>
-
+<%@ page import="org.apache.commons.lang.StringEscapeUtils" %>
 
 <%
     long defaultLang = APILocator.getLanguageAPI().getDefaultLanguage().getId();
@@ -172,8 +172,7 @@
                 JSONValue = new JSONObject(textValue);
             } catch(Exception e) {
                 // Need it in case the value contains Single quote/backtick.
-                textValue = "`" + textValue.replaceAll("`", "&#96;") + "`";
-              
+                textValue = "`" + StringEscapeUtils.escapeJavaScript(textValue.replaceAll("`", "&#96;").replaceAll("\\$", "&#36;")) + "`"; 
             }
 
             List<FieldVariable> acceptTypes=APILocator.getFieldAPI().getFieldVariablesForField(field.getInode(), user, false);
@@ -199,8 +198,8 @@
                 }
             }
             %>
-
             <script src="/html/dotcms-block-editor.js"></script>
+            <script src="/html/showdown.min.js"></script>
             <dotcms-block-editor
                 id="block-editor-<%=field.getVelocityVarName()%>"
                 allowed-content-types="<%=allowedContentTypes%>"
@@ -234,7 +233,9 @@
                         // Otherwise, we try to parse the "textValue".
                         content = JSONValue || JSON.parse(<%=textValue%>);
                     } catch (error) {
-                        content = <%=textValue%>;
+                        const text = (<%=textValue%>).replace(/&#96;/g, '`').replace(/&#36;/g, '$');
+                        const converter = new showdown.Converter({tables: true});
+                        content = converter.makeHtml(text);                      
                     }
 
                     const blockEditor = document.getElementById("block-editor-<%=field.getVelocityVarName()%>");
@@ -243,6 +244,7 @@
 
                     if (content) {
                         blockEditor.value = content;
+                        field.value = content; 
                     }
 
                     blockEditor.addEventListener('valueChange', (event) => {

diff --git a/dotCMS/src/main/webapp/html/showdown.min.js b/dotCMS/src/main/webapp/html/showdown.min.js