Merge pull request #3531 from quilljs/zh-no-escape-code

Move code escaping to `html()`
slab · Feb 11, 2022 · 885f1a2 · 885f1a2
2 parents cf9d835 + 0de0077
commit 885f1a2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/formats/code.js b/formats/code.js
@@ -14,17 +14,16 @@ class CodeBlockContainer extends Container {
   }
 
   code(index, length) {
-    const text = this.children
+    return this.children
       .map(child => (child.length() <= 1 ? '' : child.domNode.innerText))
       .join('\n')
       .slice(index, index + length);
-    return escapeText(text);
   }
 
   html(index, length) {
     // `\n`s are needed in order to support empty lines at the beginning and the end.
     // https://html.spec.whatwg.org/multipage/syntax.html#element-restrictions
-    return `<pre>\n${this.code(index, length)}\n</pre>`;
+    return `<pre>\n${escapeText(this.code(index, length))}\n</pre>`;
   }
 }
 

diff --git a/modules/syntax.js b/modules/syntax.js
@@ -141,9 +141,8 @@ class SyntaxCodeBlockContainer extends CodeBlockContainer {
       ? SyntaxCodeBlock.formats(codeBlock.domNode)
       : 'plain';
 
-    return `<pre data-language="${language}">\n${this.code(
-      index,
-      length,
+    return `<pre data-language="${language}">\n${escapeText(
+      this.code(index, length),
     )}\n</pre>`;
   }