rewrote the function code to MarkdownPreview.js #2644 #2662

Author: roottool

browser/components/MarkdownPreview.js

@@ -398,6 +398,31 @@ export default class MarkdownPreview extends React.Component {
     }
   }
 
+  /**
+   * @description Convert special characters between three ```
+   * @param {string[]} splitWithCodeTag Array of HTML strings separated by three ```
+   * @returns {string} HTML in which special characters between three ``` have been converted
+   */
+  escapeHtmlCharactersInCodeTag (splitWithCodeTag) {
+    for (let index = 0; index < splitWithCodeTag.length; index++) {
+      const codeTagRequired = (splitWithCodeTag[index] !== '\`\`\`' && index < splitWithCodeTag.length - 1)
+      if (codeTagRequired) {
+        splitWithCodeTag.splice((index + 1), 0, '\`\`\`')
+      }
+    }
+    let inCodeTag = false
+    let result = ''
+    for (let content of splitWithCodeTag) {
+      if (content === '\`\`\`') {
+        inCodeTag = !inCodeTag
+      } else if (inCodeTag) {
+        content = escapeHtmlCharacters(content)
+      }
+      result += content
+    }
+    return result
+  }
+
   getScrollBarStyle () {
     const { theme } = this.props
 
@@ -640,7 +665,7 @@ export default class MarkdownPreview extends React.Component {
     this.refs.root.contentWindow.document.body.setAttribute('data-theme', theme)
     if (sanitize === 'NONE') {
       const splitWithCodeTag = value.split('```')
-      value = attachmentManagement.escapeHtmlCharactersInCodeTag(splitWithCodeTag)
+      value = this.escapeHtmlCharactersInCodeTag(splitWithCodeTag)
     }
     const renderedHTML = this.markdown.render(value)
     attachmentManagement.migrateAttachments(value, storagePath, noteKey)

browser/main/lib/dataApi/attachmentManagement.js

@@ -7,7 +7,6 @@ const fse = require('fs-extra')
 const escapeStringRegexp = require('escape-string-regexp')
 const sander = require('sander')
 import i18n from 'browser/lib/i18n'
-import { escapeHtmlCharacters } from '../../../lib/utils'
 
 const STORAGE_FOLDER_PLACEHOLDER = ':storage'
 const DESTINATION_FOLDER = 'attachments'
@@ -221,31 +220,6 @@ function migrateAttachments (markdownContent, storagePath, noteKey) {
   }
 }
 
-/**
- * @description Convert special characters between ```
- * @param {string[]} splitWithCodeTag Array of HTML strings separated by ```
- * @returns {string} HTML in which special characters between ``` have been converted
- */
-function escapeHtmlCharactersInCodeTag (splitWithCodeTag) {
-  for (let index = 0; index < splitWithCodeTag.length; index++) {
-    const codeTagRequired = (splitWithCodeTag[index] !== '\`\`\`' && index < splitWithCodeTag.length - 1)
-    if (codeTagRequired) {
-      splitWithCodeTag.splice((index + 1), 0, '\`\`\`')
-    }
-  }
-  let inCodeTag = false
-  let result = ''
-  for (let content of splitWithCodeTag) {
-    if (content === '\`\`\`') {
-      inCodeTag = !inCodeTag
-    } else if (inCodeTag) {
-      content = escapeHtmlCharacters(content)
-    }
-    result += content
-  }
-  return result
-}
-
 /**
  * @description Fixes the URLs embedded in the generated HTML so that they again refer actual local files.
  * @param {String} renderedHTML HTML in that the links should be fixed
@@ -607,7 +581,6 @@ function handleAttachmentLinkPaste (storageKey, noteKey, linkText) {
 
 module.exports = {
   copyAttachment,
-  escapeHtmlCharactersInCodeTag,
   fixLocalURLS,
   generateAttachmentMarkdown,
   handleAttachmentDrop,